Mercurial > evolve
diff tests/test-next-abort.t @ 6187:df8df57a3ce3 mercurial-5.0
test-compat: merge mercurial-5.1 into mercurial-5.0
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 22 Feb 2022 18:21:24 +0300 |
parents | e6ae5af97683 |
children |
line wrap: on
line diff
--- a/tests/test-next-abort.t Tue Feb 22 18:14:26 2022 +0300 +++ b/tests/test-next-abort.t Tue Feb 22 18:21:24 2022 +0300 @@ -29,8 +29,6 @@ (see 'hg help evolve.interrupted') [1] -#testcases abortcommand abortflag -#if abortflag $ hg next --abort next aborted working directory is now at 1c7f51cf0ef0 @@ -47,15 +45,5 @@ $ hg next --abort --merge abort: cannot specify both --abort and --merge [255] -#else - $ hg abort --dry-run - evolve in progress, will be aborted - $ hg abort - evolve aborted - working directory is now at 1c7f51cf0ef0 - $ hg abort - abort: no operation in progress - [255] -#endif $ cd ..