Skip to content

Commit

Permalink
core/remote: Log path when resolving conflict
Browse files Browse the repository at this point in the history
  Without this information, it's harder to tell from reading the logs
  if the remote document was found and renamed or if we couldn't find it
  and nothing happened.
  It also helps getting a sense of what Sync is doing.
  • Loading branch information
taratatach committed Mar 16, 2021
1 parent 92ae034 commit a1785f7
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions core/remote/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,13 @@ class Remote /*:: implements Reader, Writer */ {
const newName = path.basename(
conflicts.generateConflictPath(newMetadata.path)
)
log.info(
{
path: path.join(path.dirname(newMetadata.path), newName),
oldpath: newMetadata.path
},
'Resolving remote conflict...'
)

const attrs = {
name: newName,
Expand Down

0 comments on commit a1785f7

Please sign in to comment.