Mercurial > hg
changeset 34571:75bd034a1e00
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
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 10 Oct 2017 11:02:53 -0400 |
| parents | dbb2027f4974 |
| children | d6d10771950c |
| files | tests/test-pathconflicts-merge.t |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)"