KeyValueBehavior

Console/Command/FolderSyncShell.php

@@ -144,7 +144,7 @@ class FolderSyncShell extends AppShell {
 			}
 			return;
 		}
-		if (file_get_contents($source) === file_get_contents($target)) {
+		if (sha1(file_get_contents($source)) === sha1(file_get_contents($target))) {
 			if (!empty($this->params['verbose'])) {
 				$this->out('   (equal, skipping)');
 			}

Model/Behavior/KeyValueBehavior.php

@@ -130,7 +130,13 @@ class KeyValueBehavior extends ModelBehavior {
 					'recursive' => -1,
 					'conditions' => array($foreignKeyField => $foreignKey, $keyField => $key),
 					'fields' => array('id')));
-				$newDetail[$this->KeyValue->alias]['id'] = $tmp[$this->KeyValue->alias]['id'];
+
+				if ($tmp) {
+					$newDetail[$this->KeyValue->alias]['id'] = $tmp[$this->KeyValue->alias]['id'];
+				} else {
+					$this->KeyValue->create();
+				}
+
 				$newDetail[$this->KeyValue->alias][$foreignKeyField] = $foreignKey;
 				$newDetail[$this->KeyValue->alias][$keyField] = $key;
 				$newDetail[$this->KeyValue->alias][$valueField] = $value;