Show More
@@ -762,12 +762,69 b' Test that rebase is not confused by $CWD' | |||||
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 experimental revset |
|
764 | Test experimental revset | |
|
765 | ======================== | |||
765 |
|
766 | |||
766 | $ cd .. |
|
767 | $ cd .. | |
767 | $ hg log -r '_destrebase()' |
|
768 | ||
768 | changeset: 3:1910d5ff34ea |
|
769 | Make the repo a bit more interresting | |
769 | tag: tip |
|
770 | ||
|
771 | $ hg up 1 | |||
|
772 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |||
|
773 | $ echo aaa > aaa | |||
|
774 | $ hg add aaa | |||
|
775 | $ hg commit -m aaa | |||
|
776 | created new head | |||
|
777 | $ hg log -G | |||
|
778 | @ changeset: 4:5f7bc9025ed2 | |||
|
779 | | tag: tip | |||
|
780 | | parent: 1:58d79cc1cf43 | |||
|
781 | | user: test | |||
|
782 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
783 | | summary: aaa | |||
|
784 | | | |||
|
785 | | o changeset: 3:1910d5ff34ea | |||
|
786 | | | user: test | |||
|
787 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
788 | | | summary: second source with subdir | |||
|
789 | | | | |||
|
790 | | o changeset: 2:82901330b6ef | |||
|
791 | |/ user: test | |||
|
792 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
793 | | summary: first source commit | |||
|
794 | | | |||
|
795 | o changeset: 1:58d79cc1cf43 | |||
|
796 | | user: test | |||
|
797 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
798 | | summary: dest commit | |||
|
799 | | | |||
|
800 | o changeset: 0:e94b687f7da3 | |||
770 | user: test |
|
801 | user: test | |
771 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
802 | date: Thu Jan 01 00:00:00 1970 +0000 | |
772 | summary: second source with subdir |
|
803 | summary: initial commit | |
|
804 | ||||
|
805 | ||||
|
806 | Testing from lower head | |||
773 |
|
807 | |||
|
808 | $ hg up 3 | |||
|
809 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
810 | $ hg log -r '_destrebase()' | |||
|
811 | changeset: 4:5f7bc9025ed2 | |||
|
812 | tag: tip | |||
|
813 | parent: 1:58d79cc1cf43 | |||
|
814 | user: test | |||
|
815 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
816 | summary: aaa | |||
|
817 | ||||
|
818 | ||||
|
819 | Testing from upper head | |||
|
820 | ||||
|
821 | $ hg up 4 | |||
|
822 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |||
|
823 | $ hg log -r '_destrebase()' | |||
|
824 | changeset: 4:5f7bc9025ed2 | |||
|
825 | tag: tip | |||
|
826 | parent: 1:58d79cc1cf43 | |||
|
827 | user: test | |||
|
828 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
829 | summary: aaa | |||
|
830 |
General Comments 0
You need to be logged in to leave comments.
Login now