268 o 1:5f6d8a4bf34a added b |
268 o 1:5f6d8a4bf34a added b |
269 | () [default] draft |
269 | () [default] draft |
270 o 0:9092f1db7931 added a |
270 o 0:9092f1db7931 added a |
271 () [default] draft |
271 () [default] draft |
272 |
272 |
273 $ hg evolve --content-divergent --any --update |
273 $ hg evolve --content-divergent --any --update --config ui.interactive=true <<EOF |
|
274 > c |
|
275 > EOF |
274 merge:[5] updated e |
276 merge:[5] updated e |
275 with: [6] updated e |
277 with: [6] updated e |
276 base: [4] added e |
278 base: [4] added e |
277 rebasing "other" content-divergent changeset de4ea3103326 on 9150fe93bec6 |
279 rebasing "divergent" content-divergent changeset ff6f7cd76a7c on 155349b645be |
278 merging d |
280 rebasing "other" content-divergent changeset de4ea3103326 on 155349b645be |
279 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
281 file 'd' was deleted in local but was modified in other. |
280 unresolved merge conflicts |
282 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
281 (see 'hg help evolve.interrupted') |
283 What do you want to do? c |
282 [1] |
284 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
283 |
285 working directory is now at eb6357cd41b6 |
284 $ hg diff --no-git --config diff.unified=3 |
|
285 diff -r 9150fe93bec6 d |
|
286 --- a/d Thu Jan 01 00:00:00 1970 +0000 |
|
287 +++ b/d Thu Jan 01 00:00:00 1970 +0000 |
|
288 @@ -1,1 +1,5 @@ |
|
289 +<<<<<<< destination: 9150fe93bec6 - test: added d |
|
290 d |
|
291 +======= |
|
292 +dd |
|
293 +>>>>>>> evolving: de4ea3103326 - test: updated e |
|
294 diff -r 9150fe93bec6 e |
|
295 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
296 +++ b/e Thu Jan 01 00:00:00 1970 +0000 |
|
297 @@ -0,0 +1,1 @@ |
|
298 +ee |
|
299 |
|
300 $ echo dresolved > d |
|
301 $ hg res -m |
|
302 (no more unresolved files) |
|
303 continue: hg evolve --continue |
|
304 |
|
305 $ hg evolve --continue |
|
306 evolving 6:de4ea3103326 "updated e" |
|
307 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
308 working directory is now at 83b1664a580f |
|
309 |
286 |
310 $ hg glog -l1 |
287 $ hg glog -l1 |
311 @ 8:83b1664a580f updated e |
288 @ 9:eb6357cd41b6 updated e |
312 | () [default] draft |
289 | () [default] draft |
313 ~ |
290 ~ |
314 |
291 |
315 $ cd .. |
292 $ cd .. |
316 |
293 |