diff -r 7e99b02768ef -r 4675c122157e tests/test-shelve.t --- 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