equal
deleted
inserted
replaced
|
1 #testcases abortcommand abortflag |
|
2 #if abortflag |
|
3 $ cat >> $HGRCPATH <<EOF |
|
4 > [alias] |
|
5 > abort = merge --abort |
|
6 > EOF |
|
7 #endif |
|
8 |
1 $ addcommit () { |
9 $ addcommit () { |
2 > echo $1 > $1 |
10 > echo $1 > $1 |
3 > hg add $1 |
11 > hg add $1 |
4 > hg commit -d "${2} 0" -m $1 |
12 > hg commit -d "${2} 0" -m $1 |
5 > } |
13 > } |
34 update: 2 new changesets, 2 branch heads (merge) |
42 update: 2 new changesets, 2 branch heads (merge) |
35 phases: 4 draft |
43 phases: 4 draft |
36 |
44 |
37 Testing the abort functionality first in case of conflicts |
45 Testing the abort functionality first in case of conflicts |
38 |
46 |
39 $ hg merge --abort |
47 $ hg abort |
40 abort: no merge in progress |
48 abort: no merge in progress (abortflag !) |
|
49 abort: no operation in progress (abortcommand !) |
41 [255] |
50 [255] |
|
51 |
42 $ hg merge |
52 $ hg merge |
43 merging A |
53 merging A |
44 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
54 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
45 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
55 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
46 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
56 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
51 [255] |
61 [255] |
52 $ hg merge --abort --rev e4501 |
62 $ hg merge --abort --rev e4501 |
53 abort: cannot specify both --rev and --abort |
63 abort: cannot specify both --rev and --abort |
54 [255] |
64 [255] |
55 |
65 |
56 $ hg merge --abort |
66 #if abortcommand |
|
67 when in dry-run mode |
|
68 $ hg abort --dry-run |
|
69 merge in progress, will be aborted |
|
70 #endif |
|
71 |
|
72 $ hg abort |
57 aborting the merge, updating back to e45016d2b3d3 |
73 aborting the merge, updating back to e45016d2b3d3 |
58 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
74 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
59 |
75 |
60 Checking that we got back in the same state |
76 Checking that we got back in the same state |
61 |
77 |
129 |
145 |
130 $ hg merge --preview --abort |
146 $ hg merge --preview --abort |
131 abort: cannot specify --preview with --abort |
147 abort: cannot specify --preview with --abort |
132 [255] |
148 [255] |
133 |
149 |
134 $ hg merge --abort |
150 $ hg abort |
135 aborting the merge, updating back to 68352a18a7c4 |
151 aborting the merge, updating back to 68352a18a7c4 |
136 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
152 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
137 |
153 |
138 $ hg id |
154 $ hg id |
139 68352a18a7c4 tip |
155 68352a18a7c4 tip |