Mercurial > evolve

comparison tests/test-next-abort.t @ 6181:e6ae5af97683 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 22 Feb 2022 08:19:44 +0300
parents ed68f64f5d0f
children df8df57a3ce3
comparison
equal deleted inserted replaced
6180:0042d69b8648 6181:e6ae5af97683
25 atop:[2] apple and blueberry 25 atop:[2] apple and blueberry
26 merging b 26 merging b
27 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 27 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
28 unresolved merge conflicts 28 unresolved merge conflicts
29 (see 'hg help evolve.interrupted') 29 (see 'hg help evolve.interrupted')
30 [240] 30 [1]
31 31
32 #testcases abortcommand abortflag 32 #testcases abortcommand abortflag
33 #if abortflag 33 #if abortflag
34 $ hg next --abort 34 $ hg next --abort
35 next aborted 35 next aborted
41 abort: no interrupted evolve to abort 41 abort: no interrupted evolve to abort
42 [255] 42 [255]
43 43
44 $ hg next --abort --move-bookmark 44 $ hg next --abort --move-bookmark
45 abort: cannot specify both --abort and --move-bookmark 45 abort: cannot specify both --abort and --move-bookmark
46 [10] 46 [255]
47 $ hg next --abort --merge 47 $ hg next --abort --merge
48 abort: cannot specify both --abort and --merge 48 abort: cannot specify both --abort and --merge
49 [10] 49 [255]
50 #else 50 #else
51 $ hg abort --dry-run 51 $ hg abort --dry-run
52 evolve in progress, will be aborted 52 evolve in progress, will be aborted
53 $ hg abort 53 $ hg abort
54 evolve aborted 54 evolve aborted
55 working directory is now at 1c7f51cf0ef0 55 working directory is now at 1c7f51cf0ef0
56 $ hg abort 56 $ hg abort
57 abort: no operation in progress 57 abort: no operation in progress
58 [20] 58 [255]
59 #endif 59 #endif
60 60
61 $ cd .. 61 $ cd ..