Mercurial > public > mercurial-scm > hg-stable
diff tests/test-pathconflicts-update.t @ 34691:857fc3313f7b
test-conflicts: conditionalize for no-symlink platforms
It seems better to create standin files for the symlinks, rather than blacklist
the entire tests. Especially since link vs file doesn't seem to affect the
tests.
There is more instability in test-pathconflicts-{basic,merge}.t that I can't
figure out.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 14 Oct 2017 01:07:59 -0400 |
| parents | d6d10771950c |
| children | 2a774cae3a03 |
line wrap: on
line diff
--- a/tests/test-pathconflicts-update.t Sat Oct 14 00:20:59 2017 -0400 +++ b/tests/test-pathconflicts-update.t Sat Oct 14 01:07:59 2017 -0400 @@ -15,7 +15,11 @@ $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkdir a +#if symlink $ ln -s c a/b +#else + $ touch a/b +#endif $ hg add a/b $ hg commit -m "link" created new head @@ -50,7 +54,11 @@ $ hg up -q 0 $ mkdir a +#if symlink $ ln -s x a/b +#else + $ touch a/b +#endif $ hg up dir a/b: untracked file conflicts with directory abort: untracked files in working directory differ from files in requested revision @@ -59,8 +67,10 @@ a/b: replacing untracked file 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark dir) +#if symlink $ readlink.py a/b.orig a/b.orig -> x +#endif $ rm a/b.orig Update - local directory conflicts with remote file @@ -94,8 +104,10 @@ a/b: replacing untracked files in directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (activating bookmark link) +#if symlink $ readlink.py a/b a/b -> c +#endif $ test -d a/b.orig $ rm -rf a/b.orig