diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -532,6 +532,15 @@ ensure that metadata-only changes are sh 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 @@ ensure that metadata-only changes are sh 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