Mercurial > hg
changeset 39761:4675c122157e
tests: stabilize test-shelve.t#phasebased for #no-symlink and #no-execbit
The rev number ended up being 11 instead of 13 on Windows. If I ever get back
to issue2020, this will go away.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 22 Sep 2018 12:11:48 -0400 |
| parents | 7e99b02768ef |
| children | edaa40dc5fe5 |
| files | tests/test-shelve.t |
| diffstat | 1 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-shelve.t Thu Sep 20 21:35:01 2018 -0700 +++ b/tests/test-shelve.t Sat Sep 22 12:11:48 2018 -0400 @@ -532,6 +532,15 @@ M a/a $ hg revert a/a +#else + +Dummy shelve op, to keep rev numbers aligned + + $ echo foo > a/a + $ hg shelve -q -n dummy a/a + $ hg unshelve -q dummy + $ hg revert a/a + #endif #if symlink @@ -545,6 +554,15 @@ M a/a $ hg revert a/a +#else + +Dummy shelve op, to keep rev numbers aligned + + $ echo bar > a/a + $ hg shelve -q -n dummy a/a + $ hg unshelve -q dummy + $ hg revert a/a + #endif set up another conflict between a commit and a shelved change