36 $ hg up ca1b80f7960a |
36 $ hg up ca1b80f7960a |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
37 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
38 $ echo bar > d |
38 $ echo bar > d |
39 $ hg add d |
39 $ hg add d |
40 $ hg amend |
40 $ hg amend |
41 1 new orphan changesets |
41 1 new unstable changesets |
42 $ hg glog |
42 $ hg glog |
43 @ 5:cb6a2ab625bb added c |
43 @ 6:cb6a2ab625bb added c |
44 | () draft |
44 | () draft |
45 | o 4:c41c793e0ef1 added d |
45 | o 4:c41c793e0ef1 added d |
46 | | () draft |
46 | | () draft |
47 | x 3:ca1b80f7960a added c |
47 | x 3:ca1b80f7960a added c |
48 |/ () draft |
48 |/ () draft |
53 o 0:8fa14d15e168 added hgignore |
53 o 0:8fa14d15e168 added hgignore |
54 () draft |
54 () draft |
55 |
55 |
56 $ hg evolve --all |
56 $ hg evolve --all |
57 move:[4] added d |
57 move:[4] added d |
58 atop:[5] added c |
58 atop:[6] added c |
59 merging d |
59 merging d |
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
61 evolve failed! |
61 evolve failed! |
62 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
62 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
63 abort: unresolved merge conflicts (see hg help resolve) |
63 abort: unresolved merge conflicts (see hg help resolve) |
71 $ hg evolve --continue |
71 $ hg evolve --continue |
72 evolving 4:c41c793e0ef1 "added d" |
72 evolving 4:c41c793e0ef1 "added d" |
73 working directory is now at 2a4e03d422e2 |
73 working directory is now at 2a4e03d422e2 |
74 |
74 |
75 $ hg glog |
75 $ hg glog |
76 @ 6:2a4e03d422e2 added d |
76 @ 7:2a4e03d422e2 added d |
77 | () draft |
77 | () draft |
78 o 5:cb6a2ab625bb added c |
78 o 6:cb6a2ab625bb added c |
79 | () draft |
79 | () draft |
80 o 2:b1661037fa25 added b |
80 o 2:b1661037fa25 added b |
81 | () draft |
81 | () draft |
82 o 1:c7586e2a9264 added a |
82 o 1:c7586e2a9264 added a |
83 | () draft |
83 | () draft |
88 |
88 |
89 $ echo foo > e |
89 $ echo foo > e |
90 $ hg ci -Aqm "added e" |
90 $ hg ci -Aqm "added e" |
91 $ hg prev |
91 $ hg prev |
92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
92 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
93 [6] added d |
93 [7] added d |
94 $ echo bar > e |
94 $ echo bar > e |
95 $ hg add e |
95 $ hg add e |
96 $ hg amend |
96 $ hg amend |
97 1 new orphan changesets |
97 1 new unstable changesets |
98 |
98 |
99 $ hg glog |
99 $ hg glog |
100 @ 8:00a5c774cc37 added d |
100 @ 10:00a5c774cc37 added d |
101 | () draft |
101 | () draft |
102 | o 7:ad0a59d83efe added e |
102 | o 8:ad0a59d83efe added e |
103 | | () draft |
103 | | () draft |
104 | x 6:2a4e03d422e2 added d |
104 | x 7:2a4e03d422e2 added d |
105 |/ () draft |
105 |/ () draft |
106 o 5:cb6a2ab625bb added c |
106 o 6:cb6a2ab625bb added c |
107 | () draft |
107 | () draft |
108 o 2:b1661037fa25 added b |
108 o 2:b1661037fa25 added b |
109 | () draft |
109 | () draft |
110 o 1:c7586e2a9264 added a |
110 o 1:c7586e2a9264 added a |
111 | () draft |
111 | () draft |
112 o 0:8fa14d15e168 added hgignore |
112 o 0:8fa14d15e168 added hgignore |
113 () draft |
113 () draft |
114 |
114 |
115 $ hg evolve |
115 $ hg evolve |
116 move:[7] added e |
116 move:[8] added e |
117 atop:[8] added d |
117 atop:[10] added d |
118 merging e |
118 merging e |
119 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
119 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
120 evolve failed! |
120 evolve failed! |
121 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
121 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
122 abort: unresolved merge conflicts (see hg help resolve) |
122 abort: unresolved merge conflicts (see hg help resolve) |
128 continue: hg evolve --continue |
128 continue: hg evolve --continue |
129 $ hg diff |
129 $ hg diff |
130 |
130 |
131 XXX: maybe we should add a message here about evolve resulting in no commit |
131 XXX: maybe we should add a message here about evolve resulting in no commit |
132 $ hg evolve --continue |
132 $ hg evolve --continue |
133 evolving 7:ad0a59d83efe "added e" |
133 evolving 8:ad0a59d83efe "added e" |
134 |
134 |
135 $ hg glog |
135 $ hg glog |
136 @ 8:00a5c774cc37 added d |
136 @ 10:00a5c774cc37 added d |
137 | () draft |
137 | () draft |
138 o 5:cb6a2ab625bb added c |
138 o 6:cb6a2ab625bb added c |
139 | () draft |
139 | () draft |
140 o 2:b1661037fa25 added b |
140 o 2:b1661037fa25 added b |
141 | () draft |
141 | () draft |
142 o 1:c7586e2a9264 added a |
142 o 1:c7586e2a9264 added a |
143 | () draft |
143 | () draft |
149 $ hg up c7586e2a9264 |
149 $ hg up c7586e2a9264 |
150 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
150 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
151 $ echo bar > b |
151 $ echo bar > b |
152 $ hg add b |
152 $ hg add b |
153 $ hg amend |
153 $ hg amend |
154 3 new orphan changesets |
154 3 new unstable changesets |
155 |
155 |
156 $ hg evolve --all |
156 $ hg evolve --all |
157 move:[2] added b |
157 move:[2] added b |
158 atop:[9] added a |
158 atop:[12] added a |
159 merging b |
159 merging b |
160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
161 evolve failed! |
161 evolve failed! |
162 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
162 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
163 abort: unresolved merge conflicts (see hg help resolve) |
163 abort: unresolved merge conflicts (see hg help resolve) |
167 $ hg resolve -m |
167 $ hg resolve -m |
168 (no more unresolved files) |
168 (no more unresolved files) |
169 continue: hg evolve --continue |
169 continue: hg evolve --continue |
170 $ hg evolve --continue |
170 $ hg evolve --continue |
171 evolving 2:b1661037fa25 "added b" |
171 evolving 2:b1661037fa25 "added b" |
172 move:[5] added c |
172 move:[6] added c |
173 atop:[10] added b |
173 atop:[13] added b |
174 move:[8] added d |
174 move:[10] added d |
175 atop:[11] added c |
175 atop:[14] added c |
176 working directory is now at 6642d2c9176e |
176 working directory is now at 6642d2c9176e |
177 |
177 |
178 $ hg glog |
178 $ hg glog |
179 @ 12:6642d2c9176e added d |
179 @ 15:6642d2c9176e added d |
180 | () draft |
180 | () draft |
181 o 11:95665a2de664 added c |
181 o 14:95665a2de664 added c |
182 | () draft |
182 | () draft |
183 o 10:87f748868183 added b |
183 o 13:87f748868183 added b |
184 | () draft |
184 | () draft |
185 o 9:53b632d203d8 added a |
185 o 12:53b632d203d8 added a |
186 | () draft |
186 | () draft |
187 o 0:8fa14d15e168 added hgignore |
187 o 0:8fa14d15e168 added hgignore |
188 () draft |
188 () draft |
189 |
189 |
190 Conlicts -> resolve -> continue -> conflicts -> resolve -> continue |
190 Conlicts -> resolve -> continue -> conflicts -> resolve -> continue |
191 Test multiple conflicts in one evolve |
191 Test multiple conflicts in one evolve |
192 |
192 |
193 $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done; |
193 $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done; |
194 |
194 |
195 $ hg glog |
195 $ hg glog |
196 @ 15:09becba8f97d added h |
196 @ 18:09becba8f97d added h |
197 | () draft |
197 | () draft |
198 o 14:5aa7b2bbd944 added g |
198 o 17:5aa7b2bbd944 added g |
199 | () draft |
199 | () draft |
200 o 13:be88f889b6dc added f |
200 o 16:be88f889b6dc added f |
201 | () draft |
201 | () draft |
202 o 12:6642d2c9176e added d |
202 o 15:6642d2c9176e added d |
203 | () draft |
203 | () draft |
204 o 11:95665a2de664 added c |
204 o 14:95665a2de664 added c |
205 | () draft |
205 | () draft |
206 o 10:87f748868183 added b |
206 o 13:87f748868183 added b |
207 | () draft |
207 | () draft |
208 o 9:53b632d203d8 added a |
208 o 12:53b632d203d8 added a |
209 | () draft |
209 | () draft |
210 o 0:8fa14d15e168 added hgignore |
210 o 0:8fa14d15e168 added hgignore |
211 () draft |
211 () draft |
212 |
212 |
213 $ hg up 95665a2de664 |
213 $ hg up 95665a2de664 |
215 |
215 |
216 $ echo bar > f |
216 $ echo bar > f |
217 $ echo bar > h |
217 $ echo bar > h |
218 $ hg add f h |
218 $ hg add f h |
219 $ hg amend |
219 $ hg amend |
220 4 new orphan changesets |
220 4 new unstable changesets |
221 |
221 |
222 $ hg glog |
222 $ hg glog |
223 @ 16:645135c5caa4 added c |
223 @ 20:645135c5caa4 added c |
224 | () draft |
224 | () draft |
225 | o 15:09becba8f97d added h |
225 | o 18:09becba8f97d added h |
226 | | () draft |
226 | | () draft |
227 | o 14:5aa7b2bbd944 added g |
227 | o 17:5aa7b2bbd944 added g |
228 | | () draft |
228 | | () draft |
229 | o 13:be88f889b6dc added f |
229 | o 16:be88f889b6dc added f |
230 | | () draft |
230 | | () draft |
231 | o 12:6642d2c9176e added d |
231 | o 15:6642d2c9176e added d |
232 | | () draft |
232 | | () draft |
233 | x 11:95665a2de664 added c |
233 | x 14:95665a2de664 added c |
234 |/ () draft |
234 |/ () draft |
235 o 10:87f748868183 added b |
235 o 13:87f748868183 added b |
236 | () draft |
236 | () draft |
237 o 9:53b632d203d8 added a |
237 o 12:53b632d203d8 added a |
238 | () draft |
238 | () draft |
239 o 0:8fa14d15e168 added hgignore |
239 o 0:8fa14d15e168 added hgignore |
240 () draft |
240 () draft |
241 |
241 |
242 $ hg evolve --all |
242 $ hg evolve --all |
243 move:[12] added d |
243 move:[15] added d |
244 atop:[16] added c |
244 atop:[20] added c |
245 move:[13] added f |
245 move:[16] added f |
246 atop:[17] added d |
246 atop:[21] added d |
247 merging f |
247 merging f |
248 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
248 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
249 evolve failed! |
249 evolve failed! |
250 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
250 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
251 abort: unresolved merge conflicts (see hg help resolve) |
251 abort: unresolved merge conflicts (see hg help resolve) |
254 $ echo foo > f |
254 $ echo foo > f |
255 $ hg resolve -m |
255 $ hg resolve -m |
256 (no more unresolved files) |
256 (no more unresolved files) |
257 continue: hg evolve --continue |
257 continue: hg evolve --continue |
258 $ hg evolve --continue |
258 $ hg evolve --continue |
259 evolving 13:be88f889b6dc "added f" |
259 evolving 16:be88f889b6dc "added f" |
260 move:[14] added g |
260 move:[17] added g |
261 atop:[18] added f |
261 atop:[22] added f |
262 move:[15] added h |
262 move:[18] added h |
263 atop:[19] added g |
263 atop:[23] added g |
264 merging h |
264 merging h |
265 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
265 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
266 evolve failed! |
266 evolve failed! |
267 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
267 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
268 abort: unresolved merge conflicts (see hg help resolve) |
268 abort: unresolved merge conflicts (see hg help resolve) |
271 $ echo foo > h |
271 $ echo foo > h |
272 $ hg resolve -m |
272 $ hg resolve -m |
273 (no more unresolved files) |
273 (no more unresolved files) |
274 continue: hg evolve --continue |
274 continue: hg evolve --continue |
275 $ hg evolve --continue |
275 $ hg evolve --continue |
276 evolving 15:09becba8f97d "added h" |
276 evolving 18:09becba8f97d "added h" |
277 working directory is now at 3ba9d3d1b089 |
277 working directory is now at 3ba9d3d1b089 |
278 |
278 |
279 Make sure, confirmopt is respected while continue |
279 Make sure, confirmopt is respected while continue |
280 |
280 |
281 $ hg glog |
281 $ hg glog |
282 @ 20:3ba9d3d1b089 added h |
282 @ 24:3ba9d3d1b089 added h |
283 | () draft |
283 | () draft |
284 o 19:981e615b14ca added g |
284 o 23:981e615b14ca added g |
285 | () draft |
285 | () draft |
286 o 18:5794f1a3cbb2 added f |
286 o 22:5794f1a3cbb2 added f |
287 | () draft |
287 | () draft |
288 o 17:e47537da02b3 added d |
288 o 21:e47537da02b3 added d |
289 | () draft |
289 | () draft |
290 o 16:645135c5caa4 added c |
290 o 20:645135c5caa4 added c |
291 | () draft |
291 | () draft |
292 o 10:87f748868183 added b |
292 o 13:87f748868183 added b |
293 | () draft |
293 | () draft |
294 o 9:53b632d203d8 added a |
294 o 12:53b632d203d8 added a |
295 | () draft |
295 | () draft |
296 o 0:8fa14d15e168 added hgignore |
296 o 0:8fa14d15e168 added hgignore |
297 () draft |
297 () draft |
298 |
298 |
299 $ hg up 5794f1a3cbb2 |
299 $ hg up 5794f1a3cbb2 |
300 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
300 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
301 $ echo bar > g |
301 $ echo bar > g |
302 $ hg add g |
302 $ hg add g |
303 $ hg amend |
303 $ hg amend |
304 2 new orphan changesets |
304 2 new unstable changesets |
305 |
305 |
306 $ hg evolve --all --confirm<<EOF |
306 $ hg evolve --all --confirm<<EOF |
307 > y |
307 > y |
308 > EOF |
308 > EOF |
309 move:[19] added g |
309 move:[23] added g |
310 atop:[21] added f |
310 atop:[26] added f |
311 perform evolve? [Ny] y |
311 perform evolve? [Ny] y |
312 merging g |
312 merging g |
313 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
313 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
314 evolve failed! |
314 evolve failed! |
315 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
315 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
324 XXX: this should have asked for confirmation |
324 XXX: this should have asked for confirmation |
325 |
325 |
326 $ hg evolve --continue<<EOF |
326 $ hg evolve --continue<<EOF |
327 > y |
327 > y |
328 > EOF |
328 > EOF |
329 evolving 19:981e615b14ca "added g" |
329 evolving 23:981e615b14ca "added g" |
330 move:[20] added h |
330 move:[24] added h |
331 atop:[22] added g |
331 atop:[27] added g |
332 perform evolve? [Ny] y |
332 perform evolve? [Ny] y |
333 working directory is now at af6bd002a48d |
333 working directory is now at af6bd002a48d |
334 |
334 |
335 $ hg glog |
335 $ hg glog |
336 @ 23:af6bd002a48d added h |
336 @ 28:af6bd002a48d added h |
337 | () draft |
337 | () draft |
338 o 22:d2c94a8f44bd added g |
338 o 27:d2c94a8f44bd added g |
339 | () draft |
339 | () draft |
340 o 21:9849fa96c885 added f |
340 o 26:9849fa96c885 added f |
341 | () draft |
341 | () draft |
342 o 17:e47537da02b3 added d |
342 o 21:e47537da02b3 added d |
343 | () draft |
343 | () draft |
344 o 16:645135c5caa4 added c |
344 o 20:645135c5caa4 added c |
345 | () draft |
345 | () draft |
346 o 10:87f748868183 added b |
346 o 13:87f748868183 added b |
347 | () draft |
347 | () draft |
348 o 9:53b632d203d8 added a |
348 o 12:53b632d203d8 added a |
349 | () draft |
349 | () draft |
350 o 0:8fa14d15e168 added hgignore |
350 o 0:8fa14d15e168 added hgignore |
351 () draft |
351 () draft |
352 |
352 |
353 Testing `evolve --continue` after `hg next --evolve` |
353 Testing `evolve --continue` after `hg next --evolve` |
354 |
354 |
355 $ hg up .^^ |
355 $ hg up .^^ |
356 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
356 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
357 $ echo foobar > g |
357 $ echo foobar > g |
358 $ hg amend |
358 $ hg amend |
359 2 new orphan changesets |
359 2 new unstable changesets |
360 |
360 |
361 $ hg next --evolve |
361 $ hg next --evolve |
362 move:[22] added g |
362 move:[27] added g |
363 atop:[24] added f |
363 atop:[30] added f |
364 merging g |
364 merging g |
365 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
365 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
366 evolve failed! |
366 evolve failed! |
367 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
367 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort |
368 abort: unresolved merge conflicts (see hg help resolve) |
368 abort: unresolved merge conflicts (see hg help resolve) |