Merge pull request #657 from nono/fix-mv-then-update

Fix rename then update a file while offline
cozy-labs · Apr 24, 2017 · 6af7441 · 6af7441
2 parents 0572cb4 + 23cd61b
commit 6af7441
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/sync.js b/src/sync.js
@@ -305,17 +305,17 @@ class Sync {
         // $FlowFixMe
         from = (this.moveFrom: Metadata)
         this.moveFrom = null
-        if (from.moveTo === doc._id) {
+        if (from.moveTo === doc._id && from.md5sum === doc.md5sum) {
           try {
             await side.moveFileAsync(doc, from)
           } catch (err) {
             this.moveFrom = from
             throw err
           }
         } else {
-          log.error('Invalid move')
-          log.error(from)
-          log.error(doc)
+          log.warn('Invalid move')
+          log.warn(from)
+          log.warn(doc)
           try {
             await side.addFileAsync(doc)
           } catch (err) {