Patchwork D998: tests: use readlink.py instead of readlink

login
register
mail settings
Submitter phabricator
Date Oct. 11, 2017, 9:05 a.m.
Message ID <c5636b144a6221adf102d3fdbefe4bac@localhost.localdomain>
Download mbox | patch
Permalink /patch/24720/
State Not Applicable
Headers show

Comments

phabricator - Oct. 11, 2017, 9:05 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG75bd034a1e00: tests: use readlink.py instead of readlink (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D998?vs=2564&id=2581

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

AFFECTED FILES
  tests/test-pathconflicts-merge.t

CHANGE DETAILS




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

Patch

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)"