Mercurial > evolve

comparison tests/test-next-abort.t @ 6187:df8df57a3ce3 mercurial-5.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
6186:c915d9441654 6187:df8df57a3ce3
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 [1] 30 [1]
31 31
32 #testcases abortcommand abortflag
33 #if abortflag
34 $ hg next --abort 32 $ hg next --abort
35 next aborted 33 next aborted
36 working directory is now at 1c7f51cf0ef0 34 working directory is now at 1c7f51cf0ef0
37 $ hg next --abort 35 $ hg next --abort
38 abort: no interrupted next to abort 36 abort: no interrupted next to abort
45 abort: cannot specify both --abort and --move-bookmark 43 abort: cannot specify both --abort and --move-bookmark
46 [255] 44 [255]
47 $ hg next --abort --merge 45 $ hg next --abort --merge
48 abort: cannot specify both --abort and --merge 46 abort: cannot specify both --abort and --merge
49 [255] 47 [255]
50 #else
51 $ hg abort --dry-run
52 evolve in progress, will be aborted
53 $ hg abort
54 evolve aborted
55 working directory is now at 1c7f51cf0ef0
56 $ hg abort
57 abort: no operation in progress
58 [255]
59 #endif
60 48
61 $ cd .. 49 $ cd ..