Mercurial > evolve

comparison tests/test-evolve-content-divergent-stack.t @ 6395:1328195f76a9 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 Mon, 06 Feb 2023 19:49:33 +0400
parents c0921b5277a0 53d63b608230
children
comparison
equal deleted inserted replaced
6349:3b486ae2e79a 6395:1328195f76a9
307 (no more unresolved files) 307 (no more unresolved files)
308 continue: hg evolve --continue 308 continue: hg evolve --continue
309 $ hg evolve -c 309 $ hg evolve -c
310 evolving 18:2ecfb60af48a "added c and newfile" 310 evolving 18:2ecfb60af48a "added c and newfile"
311 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 311 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
312 working directory is now at 7e8d59a0286a 312 working directory is now at e7933de77142
313 313
314 $ hg log -p -l1 314 $ hg log -p -l1
315 changeset: 21:7e8d59a0286a 315 changeset: 21:e7933de77142
316 tag: tip 316 tag: tip
317 parent: 17:5907cbc074a0 317 parent: 17:5907cbc074a0
318 user: test 318 user: test
319 date: Thu Jan 01 00:00:00 1970 +0000 319 date: Thu Jan 01 00:00:00 1970 +0000
320 summary: added c and newfile 320 summary: added c and newfile
321 321
322 diff -r 5907cbc074a0 -r 7e8d59a0286a c 322 diff -r 5907cbc074a0 -r e7933de77142 c
323 --- a/c Thu Jan 01 00:00:00 1970 +0000 323 --- a/c Thu Jan 01 00:00:00 1970 +0000
324 +++ b/c Thu Jan 01 00:00:00 1970 +0000 324 +++ b/c Thu Jan 01 00:00:00 1970 +0000
325 @@ -1,1 +1,1 @@ 325 @@ -1,1 +1,1 @@
326 -conflict 326 -conflict
327 +c 327 +c
328 diff -r 5907cbc074a0 -r 7e8d59a0286a newfile 328 diff -r 5907cbc074a0 -r e7933de77142 newfile
329 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 329 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
330 +++ b/newfile Thu Jan 01 00:00:00 1970 +0000 330 +++ b/newfile Thu Jan 01 00:00:00 1970 +0000
331 @@ -0,0 +1,1 @@ 331 @@ -0,0 +1,1 @@
332 +new_file 332 +new_file
333 333
476 rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514 476 rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514
477 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 477 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
478 merge:[6] added b 478 merge:[6] added b
479 with: [11] added b 479 with: [11] added b
480 base: [2] added b 480 base: [2] added b
481 rebasing "divergent" content-divergent changeset d5f148423c16 on 7e67dfb7ee31 481 rebasing "divergent" content-divergent changeset d5f148423c16 on 4c0b67f978c2
482 rebasing "other" content-divergent changeset 6eb54b5af3fb on 7e67dfb7ee31 482 rebasing "other" content-divergent changeset 6eb54b5af3fb on 4c0b67f978c2
483 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 483 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
484 merge:[7] added c 484 merge:[7] added c
485 with: [12] added c 485 with: [12] added c
486 base: [3] added c 486 base: [3] added c
487 rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 80cec1b1c90f 487 rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on c2c8d7bb6505
488 rebasing "other" content-divergent changeset 8ed612937375 on 80cec1b1c90f 488 rebasing "other" content-divergent changeset 8ed612937375 on c2c8d7bb6505
489 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 489 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
490 merge:[8] added d 490 merge:[8] added d
491 with: [13] added d 491 with: [13] added d
492 base: [4] added d 492 base: [4] added d
493 rebasing "divergent" content-divergent changeset c72d2885eb51 on 7e370616fb2b 493 rebasing "divergent" content-divergent changeset c72d2885eb51 on 2d29aa40ef18
494 rebasing "other" content-divergent changeset d45f050514c2 on 7e370616fb2b 494 rebasing "other" content-divergent changeset d45f050514c2 on 2d29aa40ef18
495 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 495 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
496 working directory is now at 7e67dfb7ee31 496 working directory is now at 4c0b67f978c2
497 497
498 $ hg glog 498 $ hg glog
499 o 24:469255caf534 added d 499 o 24:4a605b2a329e added d
500 | () [default] draft 500 | () [default] draft
501 o 21:7e370616fb2b added c 501 o 21:2d29aa40ef18 added c
502 | () [default] draft 502 | () [default] draft
503 o 18:80cec1b1c90f added b 503 o 18:c2c8d7bb6505 added b
504 | () [default] draft 504 | () [default] draft
505 @ 15:7e67dfb7ee31 watbar to a 505 @ 15:4c0b67f978c2 watbar to a
506 | () [default] draft 506 | () [default] draft
507 o 9:2228e3b74514 add newfile 507 o 9:2228e3b74514 add newfile
508 | () [default] draft 508 | () [default] draft
509 o 0:8fa14d15e168 added hgignore 509 o 0:8fa14d15e168 added hgignore
510 () [default] draft 510 () [default] draft
512 when "divergent" and "other" both hit merge conflict in relocating 512 when "divergent" and "other" both hit merge conflict in relocating
513 ------------------------------------------------------------------ 513 ------------------------------------------------------------------
514 514
515 $ hg strip 14: --hidden 515 $ hg strip 14: --hidden
516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 516 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
517 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/7e67dfb7ee31-ff5c6a6d-backup.hg 517 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/b0d57620c872-9e140417-backup.hg
518 8 new content-divergent changesets 518 8 new content-divergent changesets
519 519
520 Prepare repo to have merge conflicts 520 Prepare repo to have merge conflicts
521 $ hg up -r "max(desc('added a'))" 521 $ hg up -r "max(desc('added a'))"
522 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 522 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
525 with: [10] added a 525 with: [10] added a
526 base: [1] added a 526 base: [1] added a
527 rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514 527 rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514
528 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 528 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
529 6 new orphan changesets 529 6 new orphan changesets
530 working directory is now at 7e67dfb7ee31 530 working directory is now at 4c0b67f978c2
531 $ echo b_conflict > b 531 $ echo b_conflict > b
532 $ hg amend -A 532 $ hg amend -A
533 adding b 533 adding b
534 534
535 Let's try to evolve stack 535 Let's try to evolve stack
536 $ hg evolve --content-divergent 536 $ hg evolve --content-divergent
537 merge:[6] added b 537 merge:[6] added b
538 with: [11] added b 538 with: [11] added b
539 base: [2] added b 539 base: [2] added b
540 rebasing "divergent" content-divergent changeset d5f148423c16 on c758af982013 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 [1] 545 [1]
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
551 $ hg evolve --continue 551 $ hg evolve --continue
552 evolving 6:d5f148423c16 "added b" 552 evolving 6:d5f148423c16 "added b"
553 rebasing "other" content-divergent changeset 6eb54b5af3fb on c758af982013 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 [1] 558 [1]
565 evolving 11:6eb54b5af3fb "added b" 565 evolving 11:6eb54b5af3fb "added b"
566 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 566 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
567 merge:[7] added c 567 merge:[7] added c
568 with: [12] added c 568 with: [12] added c
569 base: [3] added c 569 base: [3] added c
570 rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on 1a79fc84e761 570 rebasing "divergent" content-divergent changeset 3ce4be6d8e5e on e55b9e217879
571 rebasing "other" content-divergent changeset 8ed612937375 on 1a79fc84e761 571 rebasing "other" content-divergent changeset 8ed612937375 on e55b9e217879
572 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 572 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
573 merge:[8] added d 573 merge:[8] added d
574 with: [13] added d 574 with: [13] added d
575 base: [4] added d 575 base: [4] added d
576 rebasing "divergent" content-divergent changeset c72d2885eb51 on 6c228f1e5409 576 rebasing "divergent" content-divergent changeset c72d2885eb51 on 0e1902cb9cef
577 rebasing "other" content-divergent changeset d45f050514c2 on 6c228f1e5409 577 rebasing "other" content-divergent changeset d45f050514c2 on 0e1902cb9cef
578 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 578 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
579 $ hg glog 579 $ hg glog
580 o 25:957008d45543 added d 580 o 25:375c5a89ec21 added d
581 | () [default] draft 581 | () [default] draft
582 o 22:6c228f1e5409 added c 582 o 22:0e1902cb9cef added c
583 | () [default] draft 583 | () [default] draft
584 o 19:1a79fc84e761 added b 584 o 19:e55b9e217879 added b
585 | () [default] draft 585 | () [default] draft
586 @ 16:c758af982013 watbar to a 586 @ 16:6b129ddb2c87 watbar to a
587 | () [default] draft 587 | () [default] draft
588 o 9:2228e3b74514 add newfile 588 o 9:2228e3b74514 add newfile
589 | () [default] draft 589 | () [default] draft
590 o 0:8fa14d15e168 added hgignore 590 o 0:8fa14d15e168 added hgignore
591 () [default] draft 591 () [default] draft
592 592
593 when relocating "other" hit merge conflict but not "divergent" 593 when relocating "other" hit merge conflict but not "divergent"
594 -------------------------------------------------------------- 594 --------------------------------------------------------------
595 $ hg strip 14: --hidden 595 $ hg strip 14: --hidden
596 0 files updated, 0 files merged, 2 files removed, 0 files unresolved 596 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
597 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/c758af982013-0af4fee9-backup.hg 597 saved backup bundle to $TESTTMP/stackrepo1/.hg/strip-backup/b0d57620c872-25c1f036-backup.hg
598 8 new content-divergent changesets 598 8 new content-divergent changesets
599 599
600 Insert conflicting changes in between the stack of content-div csets 600 Insert conflicting changes in between the stack of content-div csets
601 $ hg up -r "max(desc('added b'))" 601 $ hg up -r "max(desc('added b'))"
602 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 602 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
633 rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514 633 rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514
634 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 634 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
635 merge:[14] added b 635 merge:[14] added b
636 with: [17] added b 636 with: [17] added b
637 base: [2] added b 637 base: [2] added b
638 rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31 638 rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
639 rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31 639 rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
640 merging b 640 merging b
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
734 rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514 734 rebasing "divergent" content-divergent changeset 8e222f257bbf on 2228e3b74514
735 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 735 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
736 merge:[14] added b 736 merge:[14] added b
737 with: [17] added b 737 with: [17] added b
738 base: [2] added b 738 base: [2] added b
739 rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31 739 rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
740 rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31 740 rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
741 merging b 741 merging b
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
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
753 $ hg log -G 753 $ hg log -G
754 o changeset: 21:7e67dfb7ee31 754 o changeset: 21:4c0b67f978c2
755 | tag: tip 755 | tag: tip
756 | parent: 9:2228e3b74514 756 | parent: 9:2228e3b74514
757 | user: test 757 | user: test
758 | date: Thu Jan 01 00:00:00 1970 +0000 758 | date: Thu Jan 01 00:00:00 1970 +0000
759 | summary: watbar to a 759 | summary: watbar to a
797 | | | summary: added b 797 | | | summary: added b
798 | | | 798 | | |
799 +---x changeset: 10:c04ff147ef79 799 +---x changeset: 10:c04ff147ef79
800 | | user: test 800 | | user: test
801 | | date: Thu Jan 01 00:00:00 1970 +0000 801 | | date: Thu Jan 01 00:00:00 1970 +0000
802 | | obsolete: rewritten using evolve as 21:7e67dfb7ee31 802 | | obsolete: rewritten using evolve as 21:4c0b67f978c2
803 | | summary: added a 803 | | summary: added a
804 | | 804 | |
805 o | changeset: 9:2228e3b74514 805 o | changeset: 9:2228e3b74514
806 | | parent: 0:8fa14d15e168 806 | | parent: 0:8fa14d15e168
807 | | user: test 807 | | user: test
810 | | 810 | |
811 | x changeset: 5:8e222f257bbf 811 | x changeset: 5:8e222f257bbf
812 |/ parent: 0:8fa14d15e168 812 |/ parent: 0:8fa14d15e168
813 | user: test 813 | user: test
814 | date: Thu Jan 01 00:00:00 1970 +0000 814 | date: Thu Jan 01 00:00:00 1970 +0000
815 | obsolete: rebased using evolve as 21:7e67dfb7ee31 815 | obsolete: rebased using evolve as 21:4c0b67f978c2
816 | summary: watbar to a 816 | summary: watbar to a
817 | 817 |
818 o changeset: 0:8fa14d15e168 818 o changeset: 0:8fa14d15e168
819 user: test 819 user: test
820 date: Thu Jan 01 00:00:00 1970 +0000 820 date: Thu Jan 01 00:00:00 1970 +0000
821 summary: added hgignore 821 summary: added hgignore
822 822
823 $ hg obslog -r 'desc("watbar to a")' --all 823 $ hg obslog -r 'desc("watbar to a")' --all
824 o 7e67dfb7ee31 (21) watbar to a 824 o 4c0b67f978c2 (21) watbar to a
825 |\ rewritten from 186bdc2cdfa2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 825 |\ rewritten from b0d57620c872 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
826 | | rewritten(description, content) from c04ff147ef79 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 826 | | rewritten(description, content) from c04ff147ef79 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
827 | | 827 | |
828 x | 186bdc2cdfa2 (20) watbar to a 828 x | b0d57620c872 (20) watbar to a
829 | | rebased(parent) from 8e222f257bbf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) 829 | | rebased(parent) from 8e222f257bbf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
830 | | 830 | |
831 | x c04ff147ef79 (10) added a 831 | x c04ff147ef79 (10) added a
832 | | rebased(parent) from c7586e2a9264 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) 832 | | rebased(parent) from c7586e2a9264 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
833 | | 833 | |
855 Again, let's evolve the stack 855 Again, let's evolve the stack
856 $ hg evolve --content-divergent 856 $ hg evolve --content-divergent
857 merge:[14] added b 857 merge:[14] added b
858 with: [17] added b 858 with: [17] added b
859 base: [2] added b 859 base: [2] added b
860 rebasing "divergent" content-divergent changeset 2a955e808c53 on 7e67dfb7ee31 860 rebasing "divergent" content-divergent changeset 2a955e808c53 on 4c0b67f978c2
861 rebasing "other" content-divergent changeset 509103439e5e on 7e67dfb7ee31 861 rebasing "other" content-divergent changeset 509103439e5e on 4c0b67f978c2
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')
872 continue: hg evolve --continue 872 continue: hg evolve --continue
873 $ hg evolve --continue 873 $ hg evolve --continue
874 merge:[15] added c 874 merge:[15] added c
875 with: [18] added c 875 with: [18] added c
876 base: [3] added c 876 base: [3] added c
877 rebasing "divergent" content-divergent changeset 48b0f803817a on ddfcba2aac91 877 rebasing "divergent" content-divergent changeset 48b0f803817a on 59338f08e6ef
878 rebasing "other" content-divergent changeset eaf34afe4df3 on ddfcba2aac91 878 rebasing "other" content-divergent changeset eaf34afe4df3 on 59338f08e6ef
879 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 879 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
880 merge:[16] added d 880 merge:[16] added d
881 with: [19] added d 881 with: [19] added d
882 base: [4] added d 882 base: [4] added d
883 rebasing "divergent" content-divergent changeset 91c8ccb9c241 on bb396302d792 883 rebasing "divergent" content-divergent changeset 91c8ccb9c241 on ef321c27d145
884 rebasing "other" content-divergent changeset c351be27f199 on bb396302d792 884 rebasing "other" content-divergent changeset c351be27f199 on ef321c27d145
885 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 885 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
886 working directory is now at ddfcba2aac91 886 working directory is now at 59338f08e6ef
887 887
888 $ hg evolve -l 888 $ hg evolve -l
889 889
890 $ cd .. 890 $ cd ..
891 891
1016 rebasing "divergent" content-divergent changeset 5b2d00df9c4e on 980f7dc84c29 1016 rebasing "divergent" content-divergent changeset 5b2d00df9c4e on 980f7dc84c29
1017 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1017 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1018 merge:[4] c 1018 merge:[4] c
1019 with: [7] c 1019 with: [7] c
1020 base: [2] c 1020 base: [2] c
1021 rebasing "divergent" content-divergent changeset fef59171875e on bfba946a2829 1021 rebasing "divergent" content-divergent changeset fef59171875e on 24bad874a3c7
1022 rebasing "other" content-divergent changeset ef4885dea3da on bfba946a2829 1022 rebasing "other" content-divergent changeset ef4885dea3da on 24bad874a3c7
1023 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1023 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1024 1024
1025 Expected result: 1025 Expected result:
1026 Changeset with description "b" only adds file "b" with content "b without typo". 1026 Changeset with description "b" only adds file "b" with content "b without typo".
1027 Changeset with description "c" only adds file "c" with content "c". 1027 Changeset with description "c" only adds file "c" with content "c".
1028 1028
1029 $ hg glog -l2 -p 1029 $ hg glog -l2 -p
1030 o 12:a5abd6c7f9d8 c 1030 o 12:8a66432f9036 c
1031 | () [default] draftdiff -r bfba946a2829 -r a5abd6c7f9d8 c 1031 | () [default] draftdiff -r 24bad874a3c7 -r 8a66432f9036 c
1032 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1032 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1033 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 1033 | +++ b/c Thu Jan 01 00:00:00 1970 +0000
1034 | @@ -0,0 +1,1 @@ 1034 | @@ -0,0 +1,1 @@
1035 | +c 1035 | +c
1036 | 1036 |
1037 o 9:bfba946a2829 b 1037 o 9:24bad874a3c7 b
1038 | () [default] draftdiff -r 980f7dc84c29 -r bfba946a2829 b 1038 | () [default] draftdiff -r 980f7dc84c29 -r 24bad874a3c7 b
1039 ~ --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1039 ~ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1040 +++ b/b Thu Jan 01 00:00:00 1970 +0000 1040 +++ b/b Thu Jan 01 00:00:00 1970 +0000
1041 @@ -0,0 +1,1 @@ 1041 @@ -0,0 +1,1 @@
1042 +b without typo 1042 +b without typo
1043 1043
1119 rebasing "divergent" content-divergent changeset 8a2d93492f59 on 9703820a7d5b 1119 rebasing "divergent" content-divergent changeset 8a2d93492f59 on 9703820a7d5b
1120 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1120 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1121 merge:[5] added bar and car 1121 merge:[5] added bar and car
1122 with: [9] added bar and car 1122 with: [9] added bar and car
1123 base: [2] added bar and car 1123 base: [2] added bar and car
1124 rebasing "divergent" content-divergent changeset f4ed107810a7 on 3e0693d8f69b 1124 rebasing "divergent" content-divergent changeset f4ed107810a7 on eb084588f69b
1125 rebasing "other" content-divergent changeset 7dd5b9d42ef3 on 3e0693d8f69b 1125 rebasing "other" content-divergent changeset 7dd5b9d42ef3 on eb084588f69b
1126 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1126 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1127 2 new orphan changesets 1127 2 new orphan changesets
1128 working directory is now at 3e0693d8f69b 1128 working directory is now at eb084588f69b
1129 1129
1130 $ hg glog 1130 $ hg glog
1131 o 15:5382795441b8 added bar and car 1131 o 15:33947326df25 added bar and car
1132 | () [default] draft 1132 | () [default] draft
1133 @ 12:3e0693d8f69b added foo 1133 @ 12:eb084588f69b added foo
1134 | () [default] draft 1134 | () [default] draft
1135 | * 10:9a1f460df8b5 added dar 1135 | * 10:9a1f460df8b5 added dar
1136 | | () [default] draft 1136 | | () [default] draft
1137 | x 9:7dd5b9d42ef3 added bar and car 1137 | x 9:7dd5b9d42ef3 added bar and car
1138 | | () [default] draft 1138 | | () [default] draft