Mercurial > hg
comparison tests/test-rebase-scenario-global.t @ 30007:aca0954d3739
rebase: rebase changesets in topo order (issue5370) (BC)
There are two reasons that rebase should be done this way:
1. This would make rebasing faster because it would minimize the total
number of files to be checked out in the process, as it don't need
to switch back and forth between branches.
2. It makes resolving conflicts easier as user has a better context.
This commit changes the behavior in "Test multiple root handling" of
test-rebase-obsolete.t. It is an expected change which reflects the new
behavior that commits in a branch are grouped together when rebased.
author | Xidorn Quan <me@upsuper.org> |
---|---|
date | Sat, 17 Sep 2016 17:02:56 +1000 |
parents | 11604da46982 |
children | 90a6c18a7c1d |
comparison
equal
deleted
inserted
replaced
30006:b19c2679289c | 30007:aca0954d3739 |
---|---|
759 $ hg rebase -b . -d 1 --traceback | 759 $ hg rebase -b . -d 1 --traceback |
760 rebasing 2:779a07b1b7a0 "first source commit" | 760 rebasing 2:779a07b1b7a0 "first source commit" |
761 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) | 761 rebasing 3:a7d6f3a00bf3 "second source with subdir" (tip) |
762 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob) | 762 saved backup bundle to $TESTTMP/cwd-vanish/.hg/strip-backup/779a07b1b7a0-853e0073-backup.hg (glob) |
763 | 763 |
764 Test that rebase is done in topo order (issue5370) | |
765 | |
766 $ cd .. | |
767 $ hg init order | |
768 $ cd order | |
769 $ touch a && hg add a && hg ci -m A | |
770 $ touch b && hg add b && hg ci -m B | |
771 $ touch c && hg add c && hg ci -m C | |
772 $ hg up 1 | |
773 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
774 $ touch d && hg add d && hg ci -m D | |
775 created new head | |
776 $ hg up 2 | |
777 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
778 $ touch e && hg add e && hg ci -m E | |
779 $ hg up 3 | |
780 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
781 $ touch f && hg add f && hg ci -m F | |
782 $ hg up 0 | |
783 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
784 $ touch g && hg add g && hg ci -m G | |
785 created new head | |
786 | |
787 $ hg tglog | |
788 @ 6: 'G' | |
789 | | |
790 | o 5: 'F' | |
791 | | | |
792 | | o 4: 'E' | |
793 | | | | |
794 | o | 3: 'D' | |
795 | | | | |
796 | | o 2: 'C' | |
797 | |/ | |
798 | o 1: 'B' | |
799 |/ | |
800 o 0: 'A' | |
801 | |
802 | |
803 $ hg rebase -s 1 -d 6 | |
804 rebasing 1:76035bbd54bd "B" | |
805 rebasing 2:d84f5cfaaf14 "C" | |
806 rebasing 4:82ae8dc7a9b7 "E" | |
807 rebasing 3:ab709c9f7171 "D" | |
808 rebasing 5:412b391de760 "F" | |
809 saved backup bundle to $TESTTMP/cwd-vanish/order/.hg/strip-backup/76035bbd54bd-e341bc99-backup.hg (glob) | |
810 | |
811 $ hg tglog | |
812 o 6: 'F' | |
813 | | |
814 o 5: 'D' | |
815 | | |
816 | o 4: 'E' | |
817 | | | |
818 | o 3: 'C' | |
819 |/ | |
820 o 2: 'B' | |
821 | | |
822 @ 1: 'G' | |
823 | | |
824 o 0: 'A' | |
825 | |
826 | |
764 Test experimental revset | 827 Test experimental revset |
765 ======================== | 828 ======================== |
766 | 829 |
767 $ cd .. | 830 $ cd .. |
768 | 831 |