Mercurial > public > mercurial-scm > hg
diff tests/test-commandserver.t @ 34555:989e884d1be9
merge: check for path conflicts when merging (issue5628)
When merging, check for any path conflicts introduced by the manifest
merge and rename the conflicting file to a safe name.
Differential Revision: https://phab.mercurial-scm.org/D784
| author | Mark Thomas <mbthomas@fb.com> |
|---|---|
| date | Mon, 02 Oct 2017 14:05:30 -0700 |
| parents | 1a6707b43d05 |
| children | f3e4a5ad0d90 |
line wrap: on
line diff
--- a/tests/test-commandserver.t Mon Oct 02 14:05:30 2017 -0700 +++ b/tests/test-commandserver.t Mon Oct 02 14:05:30 2017 -0700 @@ -966,8 +966,12 @@ *** runcommand up -qC 2 *** runcommand up -qC 1 *** runcommand merge 2 - abort: path 'a/poisoned' traverses symbolic link 'a' - [255] + a: path conflict - a file or link has the same name as a directory + the local file has been renamed to a~aa04623eb0c3 + resolve manually then use 'hg resolve --mark a' + 1 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + [1] $ ls ../merge-symlink-out cache of repo.auditor should be discarded, so matcher would never traverse