Mercurial > hg

diff tests/test-pathconflicts-update.t @ 34572:d6d10771950c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/D999
author Augie Fackler <augie@google.com>
date Tue, 10 Oct 2017 11:03:14 -0400
parents 3b9428f4403d
children 857fc3313f7b
line wrap: on
line diff
--- a/tests/test-pathconflicts-update.t	Tue Oct 10 11:02:53 2017 -0400
+++ b/tests/test-pathconflicts-update.t	Tue Oct 10 11:03:14 2017 -0400
@@ -59,8 +59,8 @@
   a/b: replacing untracked file
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark dir)
-  $ readlink a/b.orig
-  x
+  $ readlink.py a/b.orig
+  a/b.orig -> x
   $ rm a/b.orig
 
 Update - local directory conflicts with remote file
@@ -94,8 +94,8 @@
   a/b: replacing untracked files in directory
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark link)
-  $ readlink a/b
-  c
+  $ readlink.py a/b
+  a/b -> c
   $ test -d a/b.orig
   $ rm -rf a/b.orig