core: Add 'up to date' log in all cases (#1079)

cozy-labs · Jun 28, 2018 · 8ccff4b · 8ccff4b
1 parent 752ab11
commit 8ccff4b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/core/merge.js b/core/merge.js
@@ -134,6 +134,7 @@ class Merge {
       if (doc.remote == null) { doc.remote = file.remote }
       if (doc.ino == null) { doc.ino = file.ino }
       if (sameFile(file, doc)) {
+        log.info({path}, 'up to date')
         return null
       } else {
         return this.pouch.put(doc)
@@ -273,6 +274,7 @@ class Merge {
       delete was.errors
       doc.moveFrom = was
       if (file && sameFile(file, doc)) {
+        log.info({path}, 'up to date (move)')
         return null
       } else if (file) {
         const dst = await this.resolveConflictAsync(side, doc, file)