Mercurial > evolve

comparison tests/test-obsolete.t @ 3105:f5d472b7e800 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 20 Oct 2017 19:32:18 +0200
parents ccfcacc5ee7c
children a867d59ea97a
comparison
equal deleted inserted replaced
3104:3dd5a6f83f8b 3105:f5d472b7e800
518 should not rebase extinct changesets 518 should not rebase extinct changesets
519 519
520 #excluded 'whole rebase set is extinct and ignored.' message not in core 520 #excluded 'whole rebase set is extinct and ignored.' message not in core
521 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 521 $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0
522 rebasing 3:0d3f46688ccc "add obsol_c" 522 rebasing 3:0d3f46688ccc "add obsol_c"
523 rebasing 8:159dfc9fa5d3 "add obsol_d''" 523 rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip)
524 2 new content-divergent changesets 524 2 new content-divergent changesets
525 $ hg --hidden log -q -r 'successors(3)' 525 $ hg --hidden log -q -r 'successors(3)'
526 4:725c380fe99b 526 4:725c380fe99b
527 10:2033b4e49474 527 10:2033b4e49474
528 $ hg up tip 528 $ hg up tip
609 $ mkcommit f 609 $ mkcommit f
610 created new head 610 created new head
611 $ echo 42 >> f 611 $ echo 42 >> f
612 $ hg commit --amend --traceback --quiet 612 $ hg commit --amend --traceback --quiet
613 $ hg log -G 613 $ hg log -G
614 @ changeset: 14:705ab2a6b72e 614 @ changeset: 15:705ab2a6b72e
615 | tag: tip 615 | tag: tip
616 | parent: 10:2033b4e49474 616 | parent: 10:2033b4e49474
617 | user: test 617 | user: test
618 | date: Thu Jan 01 00:00:00 1970 +0000 618 | date: Thu Jan 01 00:00:00 1970 +0000
619 | summary: add f 619 | summary: add f
671 671
672 $ hg up 9468a5f5d8b2 # add obsol_d'' 672 $ hg up 9468a5f5d8b2 # add obsol_d''
673 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 673 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
674 $ mkcommit "obsolet_conflicting_d" 674 $ mkcommit "obsolet_conflicting_d"
675 $ hg summary 675 $ hg summary
676 parent: 15:50f11e5e3a63 tip 676 parent: 1[46]:50f11e5e3a63 tip (re)
677 add obsolet_conflicting_d 677 add obsolet_conflicting_d
678 branch: default 678 branch: default
679 commit: (clean) 679 commit: (clean)
680 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re) 680 update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
681 phases: 3 draft 681 phases: 3 draft
687 user: test 687 user: test
688 date: Thu Jan 01 00:00:00 1970 +0000 688 date: Thu Jan 01 00:00:00 1970 +0000
689 instability: phase-divergent, content-divergent 689 instability: phase-divergent, content-divergent
690 summary: add obsol_d''' 690 summary: add obsol_d'''
691 691
692 changeset: 15:50f11e5e3a63 692 changeset: 16:50f11e5e3a63
693 tag: tip 693 tag: tip
694 parent: 11:9468a5f5d8b2 694 parent: 11:9468a5f5d8b2
695 user: test 695 user: test
696 date: Thu Jan 01 00:00:00 1970 +0000 696 date: Thu Jan 01 00:00:00 1970 +0000
697 instability: content-divergent 697 instability: content-divergent
727 727
728 Relevant marker computation 728 Relevant marker computation
729 ============================== 729 ==============================
730 730
731 $ hg log -G --hidden 731 $ hg log -G --hidden
732 @ changeset: 16:a5f7a21fe7bc 732 @ changeset: 17:a5f7a21fe7bc
733 | tag: tip 733 | tag: tip
734 | parent: 2:4538525df7e2 734 | parent: 2:4538525df7e2
735 | user: test 735 | user: test
736 | date: Thu Jan 01 00:00:00 1970 +0000 736 | date: Thu Jan 01 00:00:00 1970 +0000
737 | instability: orphan 737 | instability: orphan
738 | summary: add obsol_d'' 738 | summary: add obsol_d''
739 | 739 |
740 | o changeset: 15:50f11e5e3a63 740 | o changeset: 16:50f11e5e3a63
741 | | parent: 11:9468a5f5d8b2 741 | | parent: 11:9468a5f5d8b2
742 | | user: test 742 | | user: test
743 | | date: Thu Jan 01 00:00:00 1970 +0000 743 | | date: Thu Jan 01 00:00:00 1970 +0000
744 | | instability: content-divergent 744 | | instability: content-divergent
745 | | summary: add obsolet_conflicting_d 745 | | summary: add obsolet_conflicting_d
746 | | 746 | |
747 | | o changeset: 14:705ab2a6b72e 747 | | o changeset: 15:705ab2a6b72e
748 | | | parent: 10:2033b4e49474 748 | | | parent: 10:2033b4e49474
749 | | | user: test 749 | | | user: test
750 | | | date: Thu Jan 01 00:00:00 1970 +0000 750 | | | date: Thu Jan 01 00:00:00 1970 +0000
751 | | | summary: add f 751 | | | summary: add f
752 | | | 752 | | |
753 | | | x changeset: 14:33d458d86621
754 | | | | user: test
755 | | | | date: Thu Jan 01 00:00:00 1970 +0000
756 | | | | obsolete: pruned
757 | | | | summary: temporary amend commit for 0b1b6dd009c0
758 | | | |
753 | | | x changeset: 13:0b1b6dd009c0 759 | | | x changeset: 13:0b1b6dd009c0
754 | | |/ parent: 10:2033b4e49474 760 | | |/ parent: 10:2033b4e49474
755 | | | user: test 761 | | | user: test
756 | | | date: Thu Jan 01 00:00:00 1970 +0000 762 | | | date: Thu Jan 01 00:00:00 1970 +0000
757 | | | obsolete: amended as 705ab2a6b72e 763 | | | obsolete: amended as 705ab2a6b72e
848 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob) 854 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
849 855
850 simple rewrite with a prune attached to it 856 simple rewrite with a prune attached to it
851 857
852 $ hg debugobsolete --rev 15 858 $ hg debugobsolete --rev 15
853 a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 50f11e5e3a63806e678c734e525502f522d37e38 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} 859 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
860 33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob)
854 861
855 Transitive rewrite 862 Transitive rewrite
856 863
857 $ hg --hidden debugobsolete --rev 8 864 $ hg --hidden debugobsolete --rev 8
858 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob) 865 909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (*) {'user': 'test'} (glob)