equal
deleted
inserted
replaced
1079 |
1079 |
1080 |
1080 |
1081 $ cd .. |
1081 $ cd .. |
1082 |
1082 |
1083 log --follow --patch FILE in repository where linkrev isn't trustworthy |
1083 log --follow --patch FILE in repository where linkrev isn't trustworthy |
1084 (issue5376) |
1084 (issue5376, issue6124) |
1085 |
1085 |
1086 $ hg init follow-dup |
1086 $ hg init follow-dup |
1087 $ cd follow-dup |
1087 $ cd follow-dup |
1088 $ cat <<EOF >> .hg/hgrc |
1088 $ cat <<EOF >> .hg/hgrc |
1089 > [ui] |
1089 > [ui] |
1127 --- /dev/null |
1127 --- /dev/null |
1128 +++ b/a |
1128 +++ b/a |
1129 @@ -0,0 +1,1 @@ |
1129 @@ -0,0 +1,1 @@ |
1130 +0 |
1130 +0 |
1131 |
1131 |
|
1132 $ hg log -pr . a |
|
1133 === 3: a3 |
|
1134 diff -r 4ea02ba94d66 -r e7a6331a34f0 a |
|
1135 --- a/a |
|
1136 +++ b/a |
|
1137 @@ -1,2 +1,3 @@ |
|
1138 0 |
|
1139 1 |
|
1140 +3 |
|
1141 |
1132 |
1142 |
1133 fctx.introrev() == 2, but fctx.linkrev() == 1 |
1143 fctx.introrev() == 2, but fctx.linkrev() == 1 |
1134 |
1144 |
1135 $ hg up -q 2 |
1145 $ hg up -q 2 |
1136 $ hg log -pf a |
1146 $ hg log -pf a |
1147 --- /dev/null |
1157 --- /dev/null |
1148 +++ b/a |
1158 +++ b/a |
1149 @@ -0,0 +1,1 @@ |
1159 @@ -0,0 +1,1 @@ |
1150 +0 |
1160 +0 |
1151 |
1161 |
|
1162 |
|
1163 BROKEN: should show the same diff as for rev 2 above |
|
1164 $ hg log -pr . a |
1152 |
1165 |
1153 $ cd .. |
1166 $ cd .. |
1154 |
1167 |
1155 Multiple copy sources of a file: |
1168 Multiple copy sources of a file: |
1156 |
1169 |