Show More
@@ -1009,6 +1009,77 b' log --follow --patch FILE in repository ' | |||||
1009 |
|
1009 | |||
1010 | $ cd .. |
|
1010 | $ cd .. | |
1011 |
|
1011 | |||
|
1012 | Multiple copy sources of a file: | |||
|
1013 | ||||
|
1014 | $ hg init follow-multi | |||
|
1015 | $ cd follow-multi | |||
|
1016 | $ echo 0 >> a | |||
|
1017 | $ hg ci -qAm 'a' | |||
|
1018 | $ hg cp a b | |||
|
1019 | $ hg ci -m 'a->b' | |||
|
1020 | $ echo 2 >> a | |||
|
1021 | $ hg ci -m 'a' | |||
|
1022 | $ echo 3 >> b | |||
|
1023 | $ hg ci -m 'b' | |||
|
1024 | $ echo 4 >> a | |||
|
1025 | $ echo 4 >> b | |||
|
1026 | $ hg ci -m 'a,b' | |||
|
1027 | $ echo 5 >> a | |||
|
1028 | $ hg ci -m 'a0' | |||
|
1029 | $ echo 6 >> b | |||
|
1030 | $ hg ci -m 'b0' | |||
|
1031 | $ hg up -q 4 | |||
|
1032 | $ echo 7 >> b | |||
|
1033 | $ hg ci -m 'b1' | |||
|
1034 | created new head | |||
|
1035 | $ echo 8 >> a | |||
|
1036 | $ hg ci -m 'a1' | |||
|
1037 | $ hg rm a | |||
|
1038 | $ hg mv b a | |||
|
1039 | $ hg ci -m 'b1->a1' | |||
|
1040 | $ hg merge -qt :local | |||
|
1041 | $ hg ci -m '(a0,b1->a1)->a' | |||
|
1042 | ||||
|
1043 | $ hg log -GT '{rev}: {desc}\n' | |||
|
1044 | @ 10: (a0,b1->a1)->a | |||
|
1045 | |\ | |||
|
1046 | | o 9: b1->a1 | |||
|
1047 | | | | |||
|
1048 | | o 8: a1 | |||
|
1049 | | | | |||
|
1050 | | o 7: b1 | |||
|
1051 | | | | |||
|
1052 | o | 6: b0 | |||
|
1053 | | | | |||
|
1054 | o | 5: a0 | |||
|
1055 | |/ | |||
|
1056 | o 4: a,b | |||
|
1057 | | | |||
|
1058 | o 3: b | |||
|
1059 | | | |||
|
1060 | o 2: a | |||
|
1061 | | | |||
|
1062 | o 1: a->b | |||
|
1063 | | | |||
|
1064 | o 0: a | |||
|
1065 | ||||
|
1066 | ||||
|
1067 | since file 'a' has multiple copy sources at the revision 4, ancestors can't | |||
|
1068 | be indexed solely by fctx.linkrev(). | |||
|
1069 | ||||
|
1070 | $ hg log -T '{rev}: {desc}\n' -f a | |||
|
1071 | 10: (a0,b1->a1)->a | |||
|
1072 | 9: b1->a1 | |||
|
1073 | 7: b1 | |||
|
1074 | 5: a0 | |||
|
1075 | 4: a,b | |||
|
1076 | 3: b | |||
|
1077 | 2: a | |||
|
1078 | 1: a->b | |||
|
1079 | 0: a | |||
|
1080 | ||||
|
1081 | $ cd .. | |||
|
1082 | ||||
1012 | Test that log should respect the order of -rREV even if multiple OR conditions |
|
1083 | Test that log should respect the order of -rREV even if multiple OR conditions | |
1013 | are specified (issue5100): |
|
1084 | are specified (issue5100): | |
1014 |
|
1085 |
General Comments 0
You need to be logged in to leave comments.
Login now