Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: use readlink.py instead of readlink
authorAugie Fackler <augie@google.com>
Tue, 10 Oct 2017 11:02:53 -0400
changeset 34571 75bd034a1e00
parent 34570 dbb2027f4974
child 34572 d6d10771950c
tests: use readlink.py instead of readlink The latter doesn't always exist, such as on Solaris-derived platforms. Differential Revision: https://phab.mercurial-scm.org/D998
tests/test-pathconflicts-merge.t file | annotate | diff | comparison | revisions 
--- a/tests/test-pathconflicts-merge.t	Tue Oct 10 11:02:40 2017 -0400
+++ b/tests/test-pathconflicts-merge.t	Tue Oct 10 11:02:53 2017 -0400
@@ -121,8 +121,8 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg mv a/b~2ea68033e3be a/b.old
-  $ readlink a/b.old
-  c
+  $ readlink.py a/b.old
+  a/b.old -> c
   $ hg resolve --mark a/b
   (no more unresolved files)
   $ hg commit -m "merge link (rename link)"
hg-stable