equal
deleted
inserted
replaced
22 Testing on-failure=continue |
22 Testing on-failure=continue |
23 $ echo on-failure=continue >> $HGRCPATH |
23 $ echo on-failure=continue >> $HGRCPATH |
24 $ hg rebase -s 1 -d 2 --tool false |
24 $ hg rebase -s 1 -d 2 --tool false |
25 rebasing 1:1f28a51c3c9b "c" |
25 rebasing 1:1f28a51c3c9b "c" |
26 merging a |
26 merging a |
27 merging b |
27 merging a failed! |
28 merging a failed! |
28 merging b |
29 merging b failed! |
29 merging b failed! |
30 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
30 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
31 [240] |
31 [240] |
32 |
32 |
33 $ hg resolve --list |
33 $ hg resolve --list |
40 Testing on-failure=halt |
40 Testing on-failure=halt |
41 $ echo on-failure=halt >> $HGRCPATH |
41 $ echo on-failure=halt >> $HGRCPATH |
42 $ hg rebase -s 1 -d 2 --tool false |
42 $ hg rebase -s 1 -d 2 --tool false |
43 rebasing 1:1f28a51c3c9b "c" |
43 rebasing 1:1f28a51c3c9b "c" |
44 merging a |
44 merging a |
45 merging b |
|
46 merging a failed! |
45 merging a failed! |
47 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
46 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
48 [240] |
47 [240] |
49 |
48 |
50 $ hg resolve --list |
49 $ hg resolve --list |
65 > y |
64 > y |
66 > n |
65 > n |
67 > EOS |
66 > EOS |
68 rebasing 1:1f28a51c3c9b "c" |
67 rebasing 1:1f28a51c3c9b "c" |
69 merging a |
68 merging a |
70 merging b |
|
71 merging a failed! |
69 merging a failed! |
72 continue merge operation (yn)? y |
70 continue merge operation (yn)? y |
|
71 merging b |
73 merging b failed! |
72 merging b failed! |
74 continue merge operation (yn)? n |
73 continue merge operation (yn)? n |
75 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
74 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
76 [240] |
75 [240] |
77 |
76 |
92 > n |
91 > n |
93 > n |
92 > n |
94 > EOS |
93 > EOS |
95 rebasing 1:1f28a51c3c9b "c" |
94 rebasing 1:1f28a51c3c9b "c" |
96 merging a |
95 merging a |
97 merging b |
|
98 output file a appears unchanged |
96 output file a appears unchanged |
99 was merge successful (yn)? y |
97 was merge successful (yn)? y |
|
98 merging b |
100 output file b appears unchanged |
99 output file b appears unchanged |
101 was merge successful (yn)? n |
100 was merge successful (yn)? n |
102 merging b failed! |
101 merging b failed! |
103 continue merge operation (yn)? n |
102 continue merge operation (yn)? n |
104 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
103 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
120 > on-failure=halt |
119 > on-failure=halt |
121 > EOS |
120 > EOS |
122 $ hg rebase -s 1 -d 2 --tool true |
121 $ hg rebase -s 1 -d 2 --tool true |
123 rebasing 1:1f28a51c3c9b "c" |
122 rebasing 1:1f28a51c3c9b "c" |
124 merging a |
123 merging a |
125 merging b |
|
126 merging a failed! |
124 merging a failed! |
127 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
125 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
128 [240] |
126 [240] |
129 |
127 |
130 $ hg resolve --list |
128 $ hg resolve --list |
139 > y |
137 > y |
140 > n |
138 > n |
141 > EOS |
139 > EOS |
142 rebasing 1:1f28a51c3c9b "c" |
140 rebasing 1:1f28a51c3c9b "c" |
143 merging a |
141 merging a |
144 merging b |
|
145 was merge of 'a' successful (yn)? y |
142 was merge of 'a' successful (yn)? y |
|
143 merging b |
146 was merge of 'b' successful (yn)? n |
144 was merge of 'b' successful (yn)? n |
147 merging b failed! |
145 merging b failed! |
148 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
146 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
149 [240] |
147 [240] |
150 |
148 |
157 |
155 |
158 Check that successful tool otherwise allows the merge to continue |
156 Check that successful tool otherwise allows the merge to continue |
159 $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep |
157 $ hg rebase -s 1 -d 2 --tool echo --keep --config merge-tools.echo.premerge=keep |
160 rebasing 1:1f28a51c3c9b "c" |
158 rebasing 1:1f28a51c3c9b "c" |
161 merging a |
159 merging a |
162 merging b |
|
163 $TESTTMP/repo/a *a~base* *a~other* (glob) |
160 $TESTTMP/repo/a *a~base* *a~other* (glob) |
|
161 merging b |
164 $TESTTMP/repo/b *b~base* *b~other* (glob) |
162 $TESTTMP/repo/b *b~base* *b~other* (glob) |
165 |
163 |
166 Check that unshelve isn't broken by halting the merge |
164 Check that unshelve isn't broken by halting the merge |
167 $ cat <<EOS >> $HGRCPATH |
165 $ cat <<EOS >> $HGRCPATH |
168 > [extensions] |
166 > [extensions] |
185 $ hg ci -m baz |
183 $ hg ci -m baz |
186 $ hg unshelve --tool false --config merge-tools.false.premerge=keep |
184 $ hg unshelve --tool false --config merge-tools.false.premerge=keep |
187 unshelving change 'default' |
185 unshelving change 'default' |
188 rebasing shelved changes |
186 rebasing shelved changes |
189 merging shelve_file1 |
187 merging shelve_file1 |
190 merging shelve_file2 |
|
191 merging shelve_file1 failed! |
188 merging shelve_file1 failed! |
192 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
189 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
193 [240] |
190 [240] |
194 $ hg status --config commands.status.verbose=True |
191 $ hg status --config commands.status.verbose=True |
195 M shelve_file1 |
192 M shelve_file1 |
196 M shelve_file2 |
193 M shelve_file2 |
197 ? shelve_file1.orig |
194 ? shelve_file1.orig |
198 ? shelve_file2.orig |
|
199 # The repository is in an unfinished *unshelve* state. |
195 # The repository is in an unfinished *unshelve* state. |
200 |
196 |
201 # Unresolved merge conflicts: |
197 # Unresolved merge conflicts: |
202 # |
198 # |
203 # shelve_file1 |
199 # shelve_file1 |
208 # To continue: hg unshelve --continue |
204 # To continue: hg unshelve --continue |
209 # To abort: hg unshelve --abort |
205 # To abort: hg unshelve --abort |
210 |
206 |
211 $ hg resolve --tool false --all --re-merge |
207 $ hg resolve --tool false --all --re-merge |
212 merging shelve_file1 |
208 merging shelve_file1 |
213 merging shelve_file2 |
|
214 merging shelve_file1 failed! |
209 merging shelve_file1 failed! |
215 merge halted after failed merge (see hg resolve) |
210 merge halted after failed merge (see hg resolve) |
216 [240] |
211 [240] |
217 $ hg shelve --list |
212 $ hg shelve --list |
218 default (* ago) changes to: foo (glob) |
213 default (* ago) changes to: foo (glob) |