This is an archive of the discontinued Mercurial Phabricator instance.

Differential D999

tests: use readlink.py instead of readlink
ClosedPublic

Authored by durin42 on Oct 10 2017, 11:04 AM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHGd6d10771950c: tests: use readlink.py instead of readlink
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 10 2017, 11:04 AM
quark accepted this revision.Oct 10 2017, 2:52 PM
Closed by commit rHGd6d10771950c: tests: use readlink.py instead of readlink (authored by durin42). · Explain WhyOct 11 2017, 5:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-pathconflicts-update.t (8 lines)

Diff 2582

tests/test-pathconflicts-update.t

$ hg up dir $ hg up dir
a/b: untracked file conflicts with directory a/b: untracked file conflicts with directory
abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[255] [255]
$ hg up dir --config merge.checkunknown=warn $ hg up dir --config merge.checkunknown=warn
a/b: replacing untracked file a/b: replacing untracked file
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark dir) (activating bookmark dir)
$ readlink a/b.orig $ readlink.py a/b.orig
x a/b.orig -> x
$ rm a/b.orig $ rm a/b.orig
Update - local directory conflicts with remote file Update - local directory conflicts with remote file
$ hg up -q 0 $ hg up -q 0
$ mkdir -p a/b/c $ mkdir -p a/b/c
$ echo 9 > a/b/c/d $ echo 9 > a/b/c/d
$ hg up file $ hg up file
$ hg up link $ hg up link
a/b: untracked directory conflicts with file a/b: untracked directory conflicts with file
abort: untracked files in working directory differ from files in requested revision abort: untracked files in working directory differ from files in requested revision
[255] [255]
$ hg up link --config merge.checkunknown=warn $ hg up link --config merge.checkunknown=warn
a/b: replacing untracked files in directory a/b: replacing untracked files in directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark link) (activating bookmark link)
$ readlink a/b $ readlink.py a/b
c a/b -> c
$ test -d a/b.orig $ test -d a/b.orig
$ rm -rf a/b.orig $ rm -rf a/b.orig
Update - local renamed file conflicts with remote directory Update - local renamed file conflicts with remote directory
$ hg up -q 0 $ hg up -q 0
$ hg mv base a $ hg mv base a
$ hg status -C $ hg status -C