equal
deleted
inserted
replaced
88 $ hg evolve |
88 $ hg evolve |
89 move:[4] added d |
89 move:[4] added d |
90 atop:[5] added c |
90 atop:[5] added c |
91 merging d |
91 merging d |
92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
93 evolve failed! |
93 fix conflicts and see `hg help evolve.interrupted` |
94 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
94 [1] |
95 abort: unresolved merge conflicts (see hg help resolve) |
|
96 [255] |
|
97 |
95 |
98 $ hg evolve --stop |
96 $ hg evolve --stop |
99 stopped the interrupted evolve |
97 stopped the interrupted evolve |
100 working directory is now at cb6a2ab625bb |
98 working directory is now at cb6a2ab625bb |
101 |
99 |
136 $ hg next --evolve |
134 $ hg next --evolve |
137 move:[4] added d |
135 move:[4] added d |
138 atop:[5] added c |
136 atop:[5] added c |
139 merging d |
137 merging d |
140 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
141 evolve failed! |
139 fix conflicts and see `hg help evolve.interrupted` |
142 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
140 [1] |
143 abort: unresolved merge conflicts (see hg help resolve) |
|
144 [255] |
|
145 |
141 |
146 $ hg diff |
142 $ hg diff |
147 diff -r cb6a2ab625bb d |
143 diff -r cb6a2ab625bb d |
148 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
144 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
149 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
145 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
185 $ hg evolve |
181 $ hg evolve |
186 move:[4] added d |
182 move:[4] added d |
187 atop:[5] added c |
183 atop:[5] added c |
188 merging d |
184 merging d |
189 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
185 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
190 evolve failed! |
186 fix conflicts and see `hg help evolve.interrupted` |
191 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
187 [1] |
192 abort: unresolved merge conflicts (see hg help resolve) |
|
193 [255] |
|
194 $ echo foo > d |
188 $ echo foo > d |
195 $ hg resolve -m |
189 $ hg resolve -m |
196 (no more unresolved files) |
190 (no more unresolved files) |
197 continue: hg evolve --continue |
191 continue: hg evolve --continue |
198 $ hg evolve --continue |
192 $ hg evolve --continue |
238 atop:[8] added a |
232 atop:[8] added a |
239 move:[5] added c |
233 move:[5] added c |
240 atop:[9] added b |
234 atop:[9] added b |
241 merging c |
235 merging c |
242 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
236 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
243 evolve failed! |
237 fix conflicts and see `hg help evolve.interrupted` |
244 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
238 [1] |
245 abort: unresolved merge conflicts (see hg help resolve) |
|
246 [255] |
|
247 |
239 |
248 $ hg status |
240 $ hg status |
249 M c |
241 M c |
250 A d |
242 A d |
251 |
243 |
277 $ hg evolve --all |
269 $ hg evolve --all |
278 move:[5] added c |
270 move:[5] added c |
279 atop:[9] added b |
271 atop:[9] added b |
280 merging c |
272 merging c |
281 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
273 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
282 evolve failed! |
274 fix conflicts and see `hg help evolve.interrupted` |
283 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
275 [1] |
284 abort: unresolved merge conflicts (see hg help resolve) |
|
285 [255] |
|
286 |
276 |
287 $ echo foobar > c |
277 $ echo foobar > c |
288 $ hg resolve -m |
278 $ hg resolve -m |
289 (no more unresolved files) |
279 (no more unresolved files) |
290 continue: hg evolve --continue |
280 continue: hg evolve --continue |
355 atop:[12] added a |
345 atop:[12] added a |
356 move:[10] added c |
346 move:[10] added c |
357 atop:[13] added b |
347 atop:[13] added b |
358 merging c |
348 merging c |
359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
349 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
360 evolve failed! |
350 fix conflicts and see `hg help evolve.interrupted` |
361 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
351 [1] |
362 abort: unresolved merge conflicts (see hg help resolve) |
|
363 [255] |
|
364 |
352 |
365 $ hg evolve --stop |
353 $ hg evolve --stop |
366 stopped the interrupted evolve |
354 stopped the interrupted evolve |
367 working directory is now at a3f4b95da934 |
355 working directory is now at a3f4b95da934 |
368 |
356 |