Mercurial > evolve

comparison tests/test-split.t @ 6072:5c921c26dc40 mercurial-4.9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.0 into mercurial-4.9 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 13:29:56 +0300
parents d161fccccd80 e82ad19eb3cc
children 6b67f26f4667 2cd36fe3f4e6
comparison
equal deleted inserted replaced
6071:e82ad19eb3cc 6072:5c921c26dc40
764 764
765 Only run on 2 files 765 Only run on 2 files
766 766
767 (remaining changes gathered with unmatched one) 767 (remaining changes gathered with unmatched one)
768 768
769 adding content in files to make sure that it prompt us to select the changes,
770 as it won't prompt if a file has no changes at hunk level and passed in cli
771 (for more look into hg db72f9f6580e which made it to not prompt "examine changes to fileX"
772 for files which are explicitly mentioned by user)
773 $ echo sp2 > SPLIT2
774 $ echo sp3 > SPLIT3
775 $ echo sp4 > SPLIT4
776 $ hg amend
777
778 $ hg split SPLIT2 SPLIT3 << EOF 769 $ hg split SPLIT2 SPLIT3 << EOF
779 > y 770 > y
780 > s 771 > n
781 > c 772 > c
782 > EOF 773 > EOF
783 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 774 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
784 adding SPLIT2 775 adding SPLIT2
785 adding SPLIT3 776 adding SPLIT3
786 adding SPLIT4 777 adding SPLIT4
787 diff --git a/SPLIT2 b/SPLIT2 778 diff --git a/SPLIT2 b/SPLIT2
788 new file mode 100644 779 new file mode 100644
789 @@ -0,0 +1,1 @@ 780 examine changes to 'SPLIT2'? [Ynesfdaq?] y
790 +sp2
791 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
792 781
793 diff --git a/SPLIT3 b/SPLIT3 782 diff --git a/SPLIT3 b/SPLIT3
794 new file mode 100644 783 new file mode 100644
795 @@ -0,0 +1,1 @@ 784 examine changes to 'SPLIT3'? [Ynesfdaq?] n
796 +sp3
797 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
798 785
799 continue splitting? [Ycdq?] c 786 continue splitting? [Ycdq?] c
800
801 $ hg status --change '.~1' 787 $ hg status --change '.~1'
802 A SPLIT2 788 A SPLIT2
803 $ hg status --change '.' 789 $ hg status --change '.'
804 A SPLIT3 790 A SPLIT3
805 A SPLIT4 791 A SPLIT4
809 795
810 (no remaining changes) 796 (no remaining changes)
811 797
812 $ hg split SPLIT2 SPLIT3 << EOF 798 $ hg split SPLIT2 SPLIT3 << EOF
813 > y 799 > y
814 > s 800 > n
815 > y 801 > y
816 > y 802 > y
817 > EOF 803 > EOF
818 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 804 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
819 adding SPLIT2 805 adding SPLIT2
820 adding SPLIT3 806 adding SPLIT3
821 adding SPLIT4 807 adding SPLIT4
822 diff --git a/SPLIT2 b/SPLIT2 808 diff --git a/SPLIT2 b/SPLIT2
823 new file mode 100644 809 new file mode 100644
824 @@ -0,0 +1,1 @@ 810 examine changes to 'SPLIT2'? [Ynesfdaq?] y
825 +sp2
826 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
827 811
828 diff --git a/SPLIT3 b/SPLIT3 812 diff --git a/SPLIT3 b/SPLIT3
829 new file mode 100644 813 new file mode 100644
830 @@ -0,0 +1,1 @@ 814 examine changes to 'SPLIT3'? [Ynesfdaq?] n
831 +sp3
832 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
833 815
834 continue splitting? [Ycdq?] y 816 continue splitting? [Ycdq?] y
835 diff --git a/SPLIT3 b/SPLIT3 817 diff --git a/SPLIT3 b/SPLIT3
836 new file mode 100644 818 new file mode 100644
837 @@ -0,0 +1,1 @@ 819 examine changes to 'SPLIT3'? [Ynesfdaq?] y
838 +sp3
839 record this change to 'SPLIT3'? [Ynesfdaq?] y
840 820
841 no more changes to split 821 no more changes to split
842
843 $ hg status --change '.~2' 822 $ hg status --change '.~2'
844 A SPLIT2 823 A SPLIT2
845 $ hg status --change '.~1' 824 $ hg status --change '.~1'
846 A SPLIT3 825 A SPLIT3
847 $ hg status --change '.' 826 $ hg status --change '.'
860 adding SPLIT2 839 adding SPLIT2
861 adding SPLIT3 840 adding SPLIT3
862 adding SPLIT4 841 adding SPLIT4
863 diff --git a/SPLIT2 b/SPLIT2 842 diff --git a/SPLIT2 b/SPLIT2
864 new file mode 100644 843 new file mode 100644
865 @@ -0,0 +1,1 @@ 844 examine changes to 'SPLIT2'? [Ynesfdaq?] y
866 +sp2
867 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
868 845
869 diff --git a/SPLIT3 b/SPLIT3 846 diff --git a/SPLIT3 b/SPLIT3
870 new file mode 100644 847 new file mode 100644
871 @@ -0,0 +1,1 @@ 848 examine changes to 'SPLIT3'? [Ynesfdaq?] y
872 +sp3
873 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y
874 849
875 no more changes to split 850 no more changes to split
876 $ hg status --change '.~1' 851 $ hg status --change '.~1'
877 A SPLIT2 852 A SPLIT2
878 A SPLIT3 853 A SPLIT3
884 859
885 Check that discard does not alter unmatched files 860 Check that discard does not alter unmatched files
886 861
887 $ hg split SPLIT2 SPLIT3 << EOF 862 $ hg split SPLIT2 SPLIT3 << EOF
888 > y 863 > y
889 > s 864 > n
890 > d 865 > d
891 > EOF 866 > EOF
892 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 867 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
893 adding SPLIT2 868 adding SPLIT2
894 adding SPLIT3 869 adding SPLIT3
895 adding SPLIT4 870 adding SPLIT4
896 diff --git a/SPLIT2 b/SPLIT2 871 diff --git a/SPLIT2 b/SPLIT2
897 new file mode 100644 872 new file mode 100644
898 @@ -0,0 +1,1 @@ 873 examine changes to 'SPLIT2'? [Ynesfdaq?] y
899 +sp2
900 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
901 874
902 diff --git a/SPLIT3 b/SPLIT3 875 diff --git a/SPLIT3 b/SPLIT3
903 new file mode 100644 876 new file mode 100644
904 @@ -0,0 +1,1 @@ 877 examine changes to 'SPLIT3'? [Ynesfdaq?] n
905 +sp3
906 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
907 878
908 continue splitting? [Ycdq?] d 879 continue splitting? [Ycdq?] d
909 discarding remaining changes 880 discarding remaining changes
910 no more changes to split 881 no more changes to split
911 $ hg status --change '.~1' 882 $ hg status --change '.~1'