Mercurial > evolve

comparison tests/test-evolve-content-divergent-stack.t @ 6809:9903ee44e658 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 26 Jun 2024 18:09:37 +0400
parents 1328195f76a9
children
comparison
equal deleted inserted replaced
6808:c7d3e1d8c6f1 6809:9903ee44e658
270 rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 5907cbc074a0 270 rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 5907cbc074a0
271 merging c 271 merging c
272 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 272 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
273 unresolved merge conflicts 273 unresolved merge conflicts
274 (see 'hg help evolve.interrupted') 274 (see 'hg help evolve.interrupted')
275 [240] 275 [1]
276 $ echo c > c 276 $ echo c > c
277 $ hg resolve -m 277 $ hg resolve -m
278 (no more unresolved files) 278 (no more unresolved files)
279 continue: hg evolve --continue 279 continue: hg evolve --continue
280 280
283 rebasing "other" content-divergent changeset 2ecfb60af48a on 5907cbc074a0 283 rebasing "other" content-divergent changeset 2ecfb60af48a on 5907cbc074a0
284 merging c 284 merging c
285 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') 285 warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
286 unresolved merge conflicts 286 unresolved merge conflicts
287 (see 'hg help evolve.interrupted') 287 (see 'hg help evolve.interrupted')
288 [240] 288 [1]
289 $ hg diff 289 $ hg diff
290 diff -r 5907cbc074a0 c 290 diff -r 5907cbc074a0 c
291 --- a/c Thu Jan 01 00:00:00 1970 +0000 291 --- a/c Thu Jan 01 00:00:00 1970 +0000
292 +++ b/c Thu Jan 01 00:00:00 1970 +0000 292 +++ b/c Thu Jan 01 00:00:00 1970 +0000
293 @@ -1,1 +1,5 @@ 293 @@ -1,1 +1,5 @@
540 rebasing "divergent" content-divergent changeset d5f148423c16 on 6b129ddb2c87 540 rebasing "divergent" content-divergent changeset d5f148423c16 on 6b129ddb2c87
541 merging b 541 merging b
542 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 542 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
543 unresolved merge conflicts 543 unresolved merge conflicts
544 (see 'hg help evolve.interrupted') 544 (see 'hg help evolve.interrupted')
545 [240] 545 [1]
546 546
547 $ echo b > b 547 $ echo b > b
548 $ hg resolve -m 548 $ hg resolve -m
549 (no more unresolved files) 549 (no more unresolved files)
550 continue: hg evolve --continue 550 continue: hg evolve --continue
553 rebasing "other" content-divergent changeset 6eb54b5af3fb on 6b129ddb2c87 553 rebasing "other" content-divergent changeset 6eb54b5af3fb on 6b129ddb2c87
554 merging b 554 merging b
555 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 555 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
556 unresolved merge conflicts 556 unresolved merge conflicts
557 (see 'hg help evolve.interrupted') 557 (see 'hg help evolve.interrupted')
558 [240] 558 [1]
559 559
560 $ echo b > b 560 $ echo b > b
561 $ hg resolve -m 561 $ hg resolve -m
562 (no more unresolved files) 562 (no more unresolved files)
563 continue: hg evolve --continue 563 continue: hg evolve --continue
641 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 641 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
642 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 642 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
643 4 new orphan changesets 643 4 new orphan changesets
644 unresolved merge conflicts 644 unresolved merge conflicts
645 (see 'hg help evolve.interrupted') 645 (see 'hg help evolve.interrupted')
646 [240] 646 [1]
647 647
648 As now we have interrupted evolution of stack of content-divergent cset (when 648 As now we have interrupted evolution of stack of content-divergent cset (when
649 relocation of "divergent" also included) let's test --abort and --stop 649 relocation of "divergent" also included) let's test --abort and --stop
650 test --abort: 650 test --abort:
651 $ hg evolve --abort 651 $ hg evolve --abort
742 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 742 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
743 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 743 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
744 4 new orphan changesets 744 4 new orphan changesets
745 unresolved merge conflicts 745 unresolved merge conflicts
746 (see 'hg help evolve.interrupted') 746 (see 'hg help evolve.interrupted')
747 [240] 747 [1]
748 748
749 $ hg evolve --stop 749 $ hg evolve --stop
750 2 new orphan changesets 750 2 new orphan changesets
751 stopped the interrupted evolve 751 stopped the interrupted evolve
752 working directory is now at 509103439e5e 752 working directory is now at 509103439e5e
862 merging b 862 merging b
863 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 863 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
864 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 864 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
865 unresolved merge conflicts 865 unresolved merge conflicts
866 (see 'hg help evolve.interrupted') 866 (see 'hg help evolve.interrupted')
867 [240] 867 [1]
868 868
869 $ echo foo > b 869 $ echo foo > b
870 $ hg resolve -m 870 $ hg resolve -m
871 (no more unresolved files) 871 (no more unresolved files)
872 continue: hg evolve --continue 872 continue: hg evolve --continue