Show More
@@ -868,6 +868,112 b' Renames are followed.' | |||||
868 | +4 |
|
868 | +4 | |
869 |
|
869 | |||
870 |
|
870 | |||
|
871 | Copies. | |||
|
872 | ||||
|
873 | $ hg copy baz bbaz | |||
|
874 | $ sed 's/6/6+/' bbaz > bbaz.new | |||
|
875 | $ mv bbaz.new bbaz | |||
|
876 | $ hg commit -m 'cp baz bbaz; 6-6+' | |||
|
877 | $ hg diff -c . | |||
|
878 | diff --git a/dir/baz b/dir/bbaz | |||
|
879 | copy from dir/baz | |||
|
880 | copy to dir/bbaz | |||
|
881 | --- a/dir/baz | |||
|
882 | +++ b/dir/bbaz | |||
|
883 | @@ -7,7 +7,7 @@ | |||
|
884 | 3+ | |||
|
885 | 4 | |||
|
886 | 5 | |||
|
887 | -6 | |||
|
888 | +6+ | |||
|
889 | 7 | |||
|
890 | 8 | |||
|
891 | 9 | |||
|
892 | $ hg log --copies -f -L bbaz,10:11 -p | |||
|
893 | changeset: 10:91a3d3b6c546 | |||
|
894 | tag: tip | |||
|
895 | user: test | |||
|
896 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
897 | summary: cp baz bbaz; 6-6+ | |||
|
898 | ||||
|
899 | diff --git a/dir/baz b/dir/bbaz | |||
|
900 | copy from dir/baz | |||
|
901 | copy to dir/bbaz | |||
|
902 | --- a/dir/baz | |||
|
903 | +++ b/dir/bbaz | |||
|
904 | @@ -7,7 +7,7 @@ | |||
|
905 | 3+ | |||
|
906 | 4 | |||
|
907 | 5 | |||
|
908 | -6 | |||
|
909 | +6+ | |||
|
910 | 7 | |||
|
911 | 8 | |||
|
912 | 9 | |||
|
913 | ||||
|
914 | changeset: 3:730a61fbaecf | |||
|
915 | user: test | |||
|
916 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
917 | summary: to 11 | |||
|
918 | ||||
|
919 | diff --git a/foo b/foo | |||
|
920 | --- a/foo | |||
|
921 | +++ b/foo | |||
|
922 | @@ -6,3 +6,10 @@ | |||
|
923 | 2+ | |||
|
924 | 3 | |||
|
925 | 4 | |||
|
926 | +5 | |||
|
927 | +6 | |||
|
928 | +7 | |||
|
929 | +8 | |||
|
930 | +9 | |||
|
931 | +10 | |||
|
932 | +11 | |||
|
933 | ||||
|
934 | $ hg log -f -L bbaz,10:11 -p | |||
|
935 | changeset: 10:91a3d3b6c546 | |||
|
936 | tag: tip | |||
|
937 | user: test | |||
|
938 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
939 | summary: cp baz bbaz; 6-6+ | |||
|
940 | ||||
|
941 | diff --git a/dir/baz b/dir/bbaz | |||
|
942 | copy from dir/baz | |||
|
943 | copy to dir/bbaz | |||
|
944 | --- a/dir/baz | |||
|
945 | +++ b/dir/bbaz | |||
|
946 | @@ -7,7 +7,7 @@ | |||
|
947 | 3+ | |||
|
948 | 4 | |||
|
949 | 5 | |||
|
950 | -6 | |||
|
951 | +6+ | |||
|
952 | 7 | |||
|
953 | 8 | |||
|
954 | 9 | |||
|
955 | ||||
|
956 | changeset: 3:730a61fbaecf | |||
|
957 | user: test | |||
|
958 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
959 | summary: to 11 | |||
|
960 | ||||
|
961 | diff --git a/foo b/foo | |||
|
962 | --- a/foo | |||
|
963 | +++ b/foo | |||
|
964 | @@ -6,3 +6,10 @@ | |||
|
965 | 2+ | |||
|
966 | 3 | |||
|
967 | 4 | |||
|
968 | +5 | |||
|
969 | +6 | |||
|
970 | +7 | |||
|
971 | +8 | |||
|
972 | +9 | |||
|
973 | +10 | |||
|
974 | +11 | |||
|
975 | ||||
|
976 | ||||
871 | Binary files work but without diff hunks filtering. |
|
977 | Binary files work but without diff hunks filtering. | |
872 | (Checking w/ and w/o diff.git option.) |
|
978 | (Checking w/ and w/o diff.git option.) | |
873 |
|
979 | |||
@@ -875,7 +981,7 b' Binary files work but without diff hunks' | |||||
875 | $ hg add binary |
|
981 | $ hg add binary | |
876 | $ hg ci -m 'add a binary file' --quiet |
|
982 | $ hg ci -m 'add a binary file' --quiet | |
877 | $ hg log -f -L binary,1:2 -p |
|
983 | $ hg log -f -L binary,1:2 -p | |
878 |
changeset: 1 |
|
984 | changeset: 11:dc865b608edf | |
879 | tag: tip |
|
985 | tag: tip | |
880 | user: test |
|
986 | user: test | |
881 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
987 | date: Thu Jan 01 00:00:00 1970 +0000 | |
@@ -890,13 +996,13 b' Binary files work but without diff hunks' | |||||
890 |
|
996 | |||
891 |
|
997 | |||
892 | $ hg log -f -L binary,1:2 -p --config diff.git=false |
|
998 | $ hg log -f -L binary,1:2 -p --config diff.git=false | |
893 |
changeset: 1 |
|
999 | changeset: 11:dc865b608edf | |
894 | tag: tip |
|
1000 | tag: tip | |
895 | user: test |
|
1001 | user: test | |
896 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
1002 | date: Thu Jan 01 00:00:00 1970 +0000 | |
897 | summary: add a binary file |
|
1003 | summary: add a binary file | |
898 |
|
1004 | |||
899 |
diff -r |
|
1005 | diff -r 91a3d3b6c546 -r dc865b608edf dir/binary | |
900 | Binary file dir/binary has changed |
|
1006 | Binary file dir/binary has changed | |
901 |
|
1007 | |||
902 |
|
1008 |
General Comments 0
You need to be logged in to leave comments.
Login now