equal
deleted
inserted
replaced
68 (no more unresolved files) |
68 (no more unresolved files) |
69 continue: hg evolve --continue |
69 continue: hg evolve --continue |
70 |
70 |
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 |
74 |
74 $ hg glog |
75 $ hg glog |
75 @ 6:2a4e03d422e2 added d |
76 @ 6:2a4e03d422e2 added d |
76 | () draft |
77 | () draft |
77 o 5:cb6a2ab625bb added c |
78 o 5:cb6a2ab625bb added c |
170 evolving 2:b1661037fa25 "added b" |
171 evolving 2:b1661037fa25 "added b" |
171 move:[5] added c |
172 move:[5] added c |
172 atop:[10] added b |
173 atop:[10] added b |
173 move:[8] added d |
174 move:[8] added d |
174 atop:[11] added c |
175 atop:[11] added c |
|
176 working directory is now at 6642d2c9176e |
175 |
177 |
176 $ hg glog |
178 $ hg glog |
177 @ 12:6642d2c9176e added d |
179 @ 12:6642d2c9176e added d |
178 | () draft |
180 | () draft |
179 o 11:95665a2de664 added c |
181 o 11:95665a2de664 added c |
270 $ hg resolve -m |
272 $ hg resolve -m |
271 (no more unresolved files) |
273 (no more unresolved files) |
272 continue: hg evolve --continue |
274 continue: hg evolve --continue |
273 $ hg evolve --continue |
275 $ hg evolve --continue |
274 evolving 15:09becba8f97d "added h" |
276 evolving 15:09becba8f97d "added h" |
|
277 working directory is now at 3ba9d3d1b089 |
275 |
278 |
276 Make sure, confirmopt is respected while continue |
279 Make sure, confirmopt is respected while continue |
277 |
280 |
278 $ hg glog |
281 $ hg glog |
279 @ 20:3ba9d3d1b089 added h |
282 @ 20:3ba9d3d1b089 added h |
325 > EOF |
328 > EOF |
326 evolving 19:981e615b14ca "added g" |
329 evolving 19:981e615b14ca "added g" |
327 move:[20] added h |
330 move:[20] added h |
328 atop:[22] added g |
331 atop:[22] added g |
329 perform evolve? [Ny] y |
332 perform evolve? [Ny] y |
|
333 working directory is now at af6bd002a48d |
330 |
334 |
331 $ hg glog |
335 $ hg glog |
332 @ 23:af6bd002a48d added h |
336 @ 23:af6bd002a48d added h |
333 | () draft |
337 | () draft |
334 o 22:d2c94a8f44bd added g |
338 o 22:d2c94a8f44bd added g |