Mercurial > evolve

annotate tests/test-next-abort.t @ 6765:5376963ea1d9 mercurial-5.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.4 into mercurial-5.3
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Apr 2024 14:30:20 -0300
parents e6ae5af97683
children df8df57a3ce3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6108
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
1 Testing hg next with --abort flag and hg abort command handling an interrupted hg next
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
2
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
3 $ . "$TESTDIR/testlib/common.sh"
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
4
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
5 $ cat >> "$HGRCPATH" << EOF
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
6 > [extensions]
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
7 > evolve =
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
8 > EOF
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
9
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
10 $ hg init next-abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
11 $ cd next-abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
12
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
13 $ echo apple > a
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
14 $ hg ci -qAm apple
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
15 $ echo banana > b
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
16 $ hg ci -qAm banana
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
17 $ hg up 0
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
18 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
19 $ echo blueberry > b
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
20 $ hg ci -qAm 'apple and blueberry' --amend
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
21 1 new orphan changesets
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
22
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
23 $ hg next
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
24 move:[1] banana
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
25 atop:[2] apple and blueberry
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
26 merging b
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
27 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
28 unresolved merge conflicts
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
29 (see 'hg help evolve.interrupted')
6181
e6ae5af97683 test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents: 6108
diff changeset
30 [1]
6108
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
31
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
32 #testcases abortcommand abortflag
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
33 #if abortflag
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
34 $ hg next --abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
35 next aborted
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
36 working directory is now at 1c7f51cf0ef0
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
37 $ hg next --abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
38 abort: no interrupted next to abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
39 [255]
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
40 $ hg evolve --abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
41 abort: no interrupted evolve to abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
42 [255]
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
43
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
44 $ hg next --abort --move-bookmark
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
45 abort: cannot specify both --abort and --move-bookmark
6181
e6ae5af97683 test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents: 6108
diff changeset
46 [255]
6108
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
47 $ hg next --abort --merge
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
48 abort: cannot specify both --abort and --merge
6181
e6ae5af97683 test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents: 6108
diff changeset
49 [255]
6108
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
50 #else
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
51 $ hg abort --dry-run
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
52 evolve in progress, will be aborted
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
53 $ hg abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
54 evolve aborted
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
55 working directory is now at 1c7f51cf0ef0
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
56 $ hg abort
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
57 abort: no operation in progress
6181
e6ae5af97683 test-compat: merge mercurial-5.7 into mercurial-5.6
Anton Shestakov <av6@dwimlabs.net>
parents: 6108
diff changeset
58 [255]
6108
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
59 #endif
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
60
ed68f64f5d0f tests: move next --abort case to its own test-next-abort.t, add hg abort
Anton Shestakov <av6@dwimlabs.net>
parents:
diff changeset
61 $ cd ..