equal
deleted
inserted
replaced
71 |
71 |
72 $ hg evolve --content-divergent |
72 $ hg evolve --content-divergent |
73 merge:[2] added b |
73 merge:[2] added b |
74 with: [3] updated b |
74 with: [3] updated b |
75 base: [1] added b |
75 base: [1] added b |
76 updating to "local" side of the conflict: 44f360db368f |
|
77 merging "other" content-divergent changeset 'dcdaf152280a' |
|
78 merging b |
76 merging b |
79 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
77 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
80 committed as c1aa9cfb6cf8 |
78 committed as c1aa9cfb6cf8 |
81 working directory is now at c1aa9cfb6cf8 |
79 working directory is now at c1aa9cfb6cf8 |
82 |
80 |
167 |
165 |
168 $ hg evolve --content-divergent |
166 $ hg evolve --content-divergent |
169 merge:[2] added b |
167 merge:[2] added b |
170 with: [3] updated b |
168 with: [3] updated b |
171 base: [1] added b |
169 base: [1] added b |
172 updating to "local" side of the conflict: 580f2d01e52c |
|
173 merging "other" content-divergent changeset '0e805383168e' |
|
174 merging b |
170 merging b |
175 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
171 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
176 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
172 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
177 fix conflicts and see `hg help evolve.interrupted` |
173 fix conflicts and see `hg help evolve.interrupted` |
178 [1] |
174 [1] |
269 $ hg evolve --content-divergent --any |
265 $ hg evolve --content-divergent --any |
270 merge:[4] added d |
266 merge:[4] added d |
271 with: [5] added d e |
267 with: [5] added d e |
272 base: [3] added d |
268 base: [3] added d |
273 rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be |
269 rebasing "other" content-divergent changeset 4291d72ee19a on 155349b645be |
274 updating to "local" side of the conflict: 93cd84bbdaca |
|
275 merging "other" content-divergent changeset 'f88581407163' |
|
276 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
270 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
277 committed as 4cbe48a0c3d9 |
271 committed as 4cbe48a0c3d9 |
278 working directory is now at 4cbe48a0c3d9 |
272 working directory is now at 4cbe48a0c3d9 |
279 |
273 |
280 $ hg glog -l 1 |
274 $ hg glog -l 1 |
391 (no more unresolved files) |
385 (no more unresolved files) |
392 continue: hg evolve --continue |
386 continue: hg evolve --continue |
393 |
387 |
394 $ hg evolve --continue |
388 $ hg evolve --continue |
395 evolving 4:f31bcc378766 "added d c e" |
389 evolving 4:f31bcc378766 "added d c e" |
396 updating to "local" side of the conflict: 93cd84bbdaca |
|
397 merging "other" content-divergent changeset 'bd28d3e4a228' |
|
398 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
390 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
399 committed as 412dde898967 |
391 committed as 412dde898967 |
400 working directory is now at 412dde898967 |
392 working directory is now at 412dde898967 |
401 $ hg export |
393 $ hg export |
402 # HG changeset patch |
394 # HG changeset patch |
489 $ hg evolve --content-divergent --any |
481 $ hg evolve --content-divergent --any |
490 merge:[5] added d |
482 merge:[5] added d |
491 with: [4] added d |
483 with: [4] added d |
492 base: [3] added d |
484 base: [3] added d |
493 rebasing "other" content-divergent changeset 9411ad1fe615 on 155349b645be |
485 rebasing "other" content-divergent changeset 9411ad1fe615 on 155349b645be |
494 updating to "local" side of the conflict: 93cd84bbdaca |
|
495 merging "other" content-divergent changeset 'b5c690cdf1d5' |
|
496 merging d |
486 merging d |
497 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
487 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
498 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
488 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
499 fix conflicts and see `hg help evolve.interrupted` |
489 fix conflicts and see `hg help evolve.interrupted` |
500 [1] |
490 [1] |
617 (no more unresolved files) |
607 (no more unresolved files) |
618 continue: hg evolve --continue |
608 continue: hg evolve --continue |
619 |
609 |
620 $ hg evolve --continue |
610 $ hg evolve --continue |
621 evolving 4:3c17c7afaf6e "added c e" |
611 evolving 4:3c17c7afaf6e "added c e" |
622 updating to "local" side of the conflict: 93cd84bbdaca |
|
623 merging "other" content-divergent changeset 'c4ce3d34e784' |
|
624 merging d |
612 merging d |
625 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
613 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
626 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
614 2 files updated, 0 files merged, 0 files removed, 1 files unresolved |
627 fix conflicts and see `hg help evolve.interrupted` |
615 fix conflicts and see `hg help evolve.interrupted` |
628 [1] |
616 [1] |