Mercurial > evolve
diff tests/test-pick.t @ 6395:1328195f76a9 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 06 Feb 2023 19:49:33 +0400 |
parents | e6ae5af97683 b4e1d34ad1e9 |
children | 716912541759 a62308fb15c1 |
line wrap: on
line diff
--- a/tests/test-pick.t Thu Dec 08 20:23:47 2022 +0400 +++ b/tests/test-pick.t Mon Feb 06 19:49:33 2023 +0400 @@ -1,4 +1,4 @@ -#testcases abortcommand abortflag +#testcases abortcontinuecommand abortcontinueflag Test for the pick command $ cat >> $HGRCPATH <<EOF @@ -9,10 +9,11 @@ > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH -#if abortflag +#if abortcontinueflag $ cat >> $HGRCPATH <<EOF > [alias] > abort = pick --abort + > continue = pick --continue > EOF #endif @@ -83,13 +84,18 @@ $ hg pick --continue abort: no interrupted pick state exists [255] +#if abortcontinuecommand + $ hg continue + abort: no operation in progress + [255] +#endif Aborting without interrupted pick $ hg pick --abort abort: no interrupted pick state exists [255] -#if abortcommand +#if abortcontinuecommand $ hg abort abort: no operation in progress [255] @@ -205,7 +211,11 @@ $ hg resolve --all --mark (no more unresolved files) continue: hg pick --continue - $ hg pick --continue +#if abortcontinuecommand + $ hg continue --dry-run + pick in progress, will be resumed +#endif + $ hg continue $ hg glog @ 8:44e155eb95c7 add c | @@ -243,7 +253,7 @@ (no more unresolved files) continue: hg pick --continue - $ hg pick --continue + $ hg continue note: picking 9:4e04628911f6 created no changes to commit Testing the abort functionality of hg pick @@ -264,7 +274,7 @@ unresolved merge conflicts (see hg help resolve) [1] -#if abortcommand +#if abortcontinuecommand $ hg abort --dry-run pick in progress, will be aborted #endif @@ -330,7 +340,7 @@ (no more unresolved files) continue: hg pick --continue - $ hg pick --continue + $ hg continue $ hg phase -r . 11: secret @@ -466,7 +476,7 @@ $ hg resolve -t :other a (no more unresolved files) continue: hg pick --continue - $ hg pick --continue + $ hg continue Demonstrate that b was not forgotten and is definitely included in 4