Mercurial > evolve

comparison tests/test-split.t @ 4781:5ad6d92f125c 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
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 29 Jul 2019 14:43:10 +0200
parents d0d8c0e2f3fc ff452675566c
children 8fcdf221b046 e77c86e83fb4
comparison
equal deleted inserted replaced
4780:f1af4909c6dc 4781:5ad6d92f125c
777 777
778 Only run on 2 files 778 Only run on 2 files
779 779
780 (remaining changes gathered with unmatched one) 780 (remaining changes gathered with unmatched one)
781 781
782 adding content in files to make sure that it prompt us to select the changes,
783 as it won't prompt if a file has no changes at hunk level and passed in cli
784 (for more look into hg db72f9f6580e which made it to not prompt "examine changes to fileX"
785 for files which are explicitly mentioned by user)
786 $ echo sp2 > SPLIT2
787 $ echo sp3 > SPLIT3
788 $ echo sp4 > SPLIT4
789 $ hg amend
790
791 $ hg split SPLIT2 SPLIT3 << EOF 782 $ hg split SPLIT2 SPLIT3 << EOF
792 > y 783 > y
793 > s 784 > n
794 > c 785 > c
795 > EOF 786 > EOF
796 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 787 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
797 adding SPLIT2 788 adding SPLIT2
798 adding SPLIT3 789 adding SPLIT3
799 adding SPLIT4 790 adding SPLIT4
800 diff --git a/SPLIT2 b/SPLIT2 791 diff --git a/SPLIT2 b/SPLIT2
801 new file mode 100644 792 new file mode 100644
802 @@ -0,0 +1,1 @@ 793 examine changes to 'SPLIT2'? [Ynesfdaq?] y
803 +sp2
804 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
805 794
806 diff --git a/SPLIT3 b/SPLIT3 795 diff --git a/SPLIT3 b/SPLIT3
807 new file mode 100644 796 new file mode 100644
808 @@ -0,0 +1,1 @@ 797 examine changes to 'SPLIT3'? [Ynesfdaq?] n
809 +sp3
810 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
811 798
812 continue splitting? [Ycdq?] c 799 continue splitting? [Ycdq?] c
813
814 $ hg status --change '.~1' 800 $ hg status --change '.~1'
815 A SPLIT2 801 A SPLIT2
816 $ hg status --change '.' 802 $ hg status --change '.'
817 A SPLIT3 803 A SPLIT3
818 A SPLIT4 804 A SPLIT4
822 808
823 (no remaining changes) 809 (no remaining changes)
824 810
825 $ hg split SPLIT2 SPLIT3 << EOF 811 $ hg split SPLIT2 SPLIT3 << EOF
826 > y 812 > y
827 > s 813 > n
828 > y 814 > y
829 > y 815 > y
830 > EOF 816 > EOF
831 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 817 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
832 adding SPLIT2 818 adding SPLIT2
833 adding SPLIT3 819 adding SPLIT3
834 adding SPLIT4 820 adding SPLIT4
835 diff --git a/SPLIT2 b/SPLIT2 821 diff --git a/SPLIT2 b/SPLIT2
836 new file mode 100644 822 new file mode 100644
837 @@ -0,0 +1,1 @@ 823 examine changes to 'SPLIT2'? [Ynesfdaq?] y
838 +sp2
839 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
840 824
841 diff --git a/SPLIT3 b/SPLIT3 825 diff --git a/SPLIT3 b/SPLIT3
842 new file mode 100644 826 new file mode 100644
843 @@ -0,0 +1,1 @@ 827 examine changes to 'SPLIT3'? [Ynesfdaq?] n
844 +sp3
845 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
846 828
847 continue splitting? [Ycdq?] y 829 continue splitting? [Ycdq?] y
848 diff --git a/SPLIT3 b/SPLIT3 830 diff --git a/SPLIT3 b/SPLIT3
849 new file mode 100644 831 new file mode 100644
850 @@ -0,0 +1,1 @@ 832 examine changes to 'SPLIT3'? [Ynesfdaq?] y
851 +sp3
852 record this change to 'SPLIT3'? [Ynesfdaq?] y
853 833
854 no more change to split 834 no more change to split
855
856 $ hg status --change '.~2' 835 $ hg status --change '.~2'
857 A SPLIT2 836 A SPLIT2
858 $ hg status --change '.~1' 837 $ hg status --change '.~1'
859 A SPLIT3 838 A SPLIT3
860 $ hg status --change '.' 839 $ hg status --change '.'
873 adding SPLIT2 852 adding SPLIT2
874 adding SPLIT3 853 adding SPLIT3
875 adding SPLIT4 854 adding SPLIT4
876 diff --git a/SPLIT2 b/SPLIT2 855 diff --git a/SPLIT2 b/SPLIT2
877 new file mode 100644 856 new file mode 100644
878 @@ -0,0 +1,1 @@ 857 examine changes to 'SPLIT2'? [Ynesfdaq?] y
879 +sp2
880 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
881 858
882 diff --git a/SPLIT3 b/SPLIT3 859 diff --git a/SPLIT3 b/SPLIT3
883 new file mode 100644 860 new file mode 100644
884 @@ -0,0 +1,1 @@ 861 examine changes to 'SPLIT3'? [Ynesfdaq?] y
885 +sp3
886 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] y
887 862
888 no more change to split 863 no more change to split
889 $ hg status --change '.~1' 864 $ hg status --change '.~1'
890 A SPLIT2 865 A SPLIT2
891 A SPLIT3 866 A SPLIT3
897 872
898 Check that discard does not alter unmatched files 873 Check that discard does not alter unmatched files
899 874
900 $ hg split SPLIT2 SPLIT3 << EOF 875 $ hg split SPLIT2 SPLIT3 << EOF
901 > y 876 > y
902 > s 877 > n
903 > d 878 > d
904 > EOF 879 > EOF
905 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 880 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
906 adding SPLIT2 881 adding SPLIT2
907 adding SPLIT3 882 adding SPLIT3
908 adding SPLIT4 883 adding SPLIT4
909 diff --git a/SPLIT2 b/SPLIT2 884 diff --git a/SPLIT2 b/SPLIT2
910 new file mode 100644 885 new file mode 100644
911 @@ -0,0 +1,1 @@ 886 examine changes to 'SPLIT2'? [Ynesfdaq?] y
912 +sp2
913 record change 1/2 to 'SPLIT2'? [Ynesfdaq?] y
914 887
915 diff --git a/SPLIT3 b/SPLIT3 888 diff --git a/SPLIT3 b/SPLIT3
916 new file mode 100644 889 new file mode 100644
917 @@ -0,0 +1,1 @@ 890 examine changes to 'SPLIT3'? [Ynesfdaq?] n
918 +sp3
919 record change 2/2 to 'SPLIT3'? [Ynesfdaq?] s
920 891
921 continue splitting? [Ycdq?] d 892 continue splitting? [Ycdq?] d
922 discarding remaining changes 893 discarding remaining changes
923 no more change to split 894 no more change to split
924 $ hg status --change '.~1' 895 $ hg status --change '.~1'