D998: tests: use readlink.py instead of readlink

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Tue Oct 10 18:15:35 UTC 2017


durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The latter doesn't always exist, such as on Solaris-derived platforms.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D998

AFFECTED FILES
  tests/test-pathconflicts-merge.t

CHANGE DETAILS

diff --git a/tests/test-pathconflicts-merge.t b/tests/test-pathconflicts-merge.t
--- a/tests/test-pathconflicts-merge.t
+++ b/tests/test-pathconflicts-merge.t
@@ -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)"



To: durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list