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

login
register
mail settings
Submitter phabricator
Date Oct. 11, 2017, 9:05 a.m.
Message ID <1f618446f5bd7df2bed94f6c41e367a4@localhost.localdomain>
Download mbox | patch
Permalink /patch/24721/
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 rHGd6d10771950c: tests: use readlink.py instead of readlink (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D999?vs=2565&id=2582

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

AFFECTED FILES
  tests/test-pathconflicts-update.t

CHANGE DETAILS




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

Patch

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