diff options
| -rw-r--r-- | Command/Sync.hs | 2 | ||||
| -rw-r--r-- | Test.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index e5ab4cf4b..c41f46f8a 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -276,7 +276,7 @@ mergeFrom branch = do return r runmerge a = ifM a ( return True - , void resolveMerge >> return False + , resolveMerge ) {- Resolves a conflicted merge. It's important that any conflicts be @@ -759,7 +759,7 @@ test_conflict_resolution env = "automatic conflict resolution" ~: {- Sync twice in r1 so it gets the conflict resolution - update from r2 -} forM_ [r1, r2, r1] $ \r -> indir env r $ do - git_annex env "sync" [] @? "sync failed in " ++ rname r + git_annex env "sync" ["--force"] @? "sync failed in " ++ rname r {- After the sync, it should be possible to get all - files. This includes both sides of the conflict, - although the filenames are not easily predictable. diff --git a/debian/changelog b/debian/changelog index e316b5e1a..975818366 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,6 @@ git-annex (5.20131102) UNRELEASED; urgency=low "git status" won't work in them. * The -c option now not only modifies the git configuration seen by git-annex, but it is passed along to every git command git-annex runs. - * sync: When there are merge conflicts that get automatically resolved, - exit nonzero at the end. * watcher: Avoid loop when adding a file owned by someone else fails in indirect mode because its permissions cannot be modified. * webapp: Avoid encoding problems when displaying the daemon log file. |