Mercurial > public > mercurial-scm > hg

diff tests/test-commandserver.t @ 34942:2a774cae3a03 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: disable path conflict checking by default (issue5716) We shouldn't ship a severe perf regression in hg update for 4.4. Differential Revision: https://phab.mercurial-scm.org/D1223
author Siddharth Agarwal <sid0@fb.com>
date Tue, 24 Oct 2017 11:15:30 -0700
parents 3a3adbcbd3a0
children c9740b69b9b7
line wrap: on
line diff
--- a/tests/test-commandserver.t	Tue Oct 24 11:14:38 2017 -0700
+++ b/tests/test-commandserver.t	Tue Oct 24 11:15:30 2017 -0700
@@ -975,12 +975,8 @@
   *** runcommand up -qC 2
   *** runcommand up -qC 1
   *** runcommand merge 2
-  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]
+  abort: path 'a/poisoned' traverses symbolic link 'a'
+   [255]
   $ ls ../merge-symlink-out
 
 cache of repo.auditor should be discarded, so matcher would never traverse