--- a/tests/test-audit-path.t Tue Oct 24 11:14:38 2017 -0700
+++ b/tests/test-audit-path.t Tue Oct 24 11:15:30 2017 -0700
@@ -104,8 +104,7 @@
back/test
#if symlink
$ hg update -Cr2
- back: is both a file and a directory
- abort: destination manifest contains path conflicts
+ abort: path 'back/test' traverses symbolic link 'back'
[255]
#else
('back' will be a file and cause some other system specific error)
@@ -167,12 +166,8 @@
$ hg up -qC 1
$ hg 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]
try rebase onto other revision: cache of audited paths should be discarded,
and the rebase should fail (issue5628)
@@ -180,11 +175,8 @@
$ hg up -qC 2
$ hg rebase -s 2 -d 1 --config extensions.rebase=
rebasing 2:e73c21d6b244 "file a/poisoned" (tip)
- 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'
- unresolved conflicts (see hg resolve, then hg rebase --continue)
- [1]
+ abort: path 'a/poisoned' traverses symbolic link 'a'
+ [255]
$ ls ../merge-symlink-out
$ cd ..
@@ -216,8 +208,7 @@
$ hg up -qC 0
$ hg up 1
- a: is both a file and a directory
- abort: destination manifest contains path conflicts
+ abort: path 'a/b' traverses symbolic link 'a'
[255]
try linear update including symlinked directory and its content: paths are
@@ -226,8 +217,7 @@
$ hg up -qC null
$ hg up 1
- a: is both a file and a directory
- abort: destination manifest contains path conflicts
+ abort: path 'a/b' traverses symbolic link 'a'
[255]
$ ls ../update-symlink-out
@@ -238,8 +228,7 @@
$ rm -f a
$ hg up -qC 2
$ hg up 1
- a: is both a file and a directory
- abort: destination manifest contains path conflicts
+ abort: path 'a/b' traverses symbolic link 'a'
[255]
$ ls ../update-symlink-out