Show More
@@ -78,7 +78,7 b' Add some linear rename initialy' | |||||
78 | $ echo "original content for P" > p |
|
78 | $ echo "original content for P" > p | |
79 | $ echo "original content for Q" > q |
|
79 | $ echo "original content for Q" > q | |
80 | $ echo "original content for R" > r |
|
80 | $ echo "original content for R" > r | |
81 | $ hg ci -Am 'i-0 initial commit: a b h' |
|
81 | $ hg ci -Am 'i-0 initial commit: a b h p q r' | |
82 | adding a |
|
82 | adding a | |
83 | adding b |
|
83 | adding b | |
84 | adding h |
|
84 | adding h | |
@@ -96,7 +96,7 b' Add some linear rename initialy' | |||||
96 | | |
|
96 | | | |
97 | o i-1: a -move-> c, p -move-> s |
|
97 | o i-1: a -move-> c, p -move-> s | |
98 | | |
|
98 | | | |
99 | o i-0 initial commit: a b h |
|
99 | o i-0 initial commit: a b h p q r | |
100 |
|
100 | |||
101 |
|
101 | |||
102 | And having another branch with renames on the other side |
|
102 | And having another branch with renames on the other side | |
@@ -114,7 +114,7 b' And having another branch with renames o' | |||||
114 | | |
|
114 | | | |
115 | o i-1: a -move-> c, p -move-> s |
|
115 | o i-1: a -move-> c, p -move-> s | |
116 | | |
|
116 | | | |
117 | o i-0 initial commit: a b h |
|
117 | o i-0 initial commit: a b h p q r | |
118 |
|
118 | |||
119 |
|
119 | |||
120 | Have a branching with nothing on one side |
|
120 | Have a branching with nothing on one side | |
@@ -131,7 +131,7 b' Have a branching with nothing on one sid' | |||||
131 | | |
|
131 | | | |
132 | o i-1: a -move-> c, p -move-> s |
|
132 | o i-1: a -move-> c, p -move-> s | |
133 | | |
|
133 | | | |
134 | o i-0 initial commit: a b h |
|
134 | o i-0 initial commit: a b h p q r | |
135 |
|
135 | |||
136 |
|
136 | |||
137 | Create a branch that delete a file previous renamed |
|
137 | Create a branch that delete a file previous renamed | |
@@ -148,7 +148,7 b' Create a branch that delete a file previ' | |||||
148 | | |
|
148 | | | |
149 | o i-1: a -move-> c, p -move-> s |
|
149 | o i-1: a -move-> c, p -move-> s | |
150 | | |
|
150 | | | |
151 | o i-0 initial commit: a b h |
|
151 | o i-0 initial commit: a b h p q r | |
152 |
|
152 | |||
153 |
|
153 | |||
154 | Create a branch that delete a file previous renamed and recreate it |
|
154 | Create a branch that delete a file previous renamed and recreate it | |
@@ -170,7 +170,7 b' Create a branch that delete a file previ' | |||||
170 | | |
|
170 | | | |
171 | o i-1: a -move-> c, p -move-> s |
|
171 | o i-1: a -move-> c, p -move-> s | |
172 | | |
|
172 | | | |
173 | o i-0 initial commit: a b h |
|
173 | o i-0 initial commit: a b h p q r | |
174 |
|
174 | |||
175 |
|
175 | |||
176 | Having another branch renaming a different file to the same filename as another |
|
176 | Having another branch renaming a different file to the same filename as another | |
@@ -191,7 +191,7 b' Having another branch renaming a differe' | |||||
191 | | |
|
191 | | | |
192 | o i-1: a -move-> c, p -move-> s |
|
192 | o i-1: a -move-> c, p -move-> s | |
193 | | |
|
193 | | | |
194 | o i-0 initial commit: a b h |
|
194 | o i-0 initial commit: a b h p q r | |
195 |
|
195 | |||
196 | $ hg up -q null |
|
196 | $ hg up -q null | |
197 |
|
197 | |||
@@ -213,7 +213,7 b" Having a branch similar to the 'a' one, " | |||||
213 | | |
|
213 | | | |
214 | o i-1: a -move-> c, p -move-> s |
|
214 | o i-1: a -move-> c, p -move-> s | |
215 | | |
|
215 | | | |
216 | o i-0 initial commit: a b h |
|
216 | o i-0 initial commit: a b h p q r | |
217 |
|
217 | |||
218 | $ hg up -q null |
|
218 | $ hg up -q null | |
219 |
|
219 | |||
@@ -235,7 +235,7 b' Having another branch renaming a differe' | |||||
235 | | |
|
235 | | | |
236 | o i-1: a -move-> c, p -move-> s |
|
236 | o i-1: a -move-> c, p -move-> s | |
237 | | |
|
237 | | | |
238 | o i-0 initial commit: a b h |
|
238 | o i-0 initial commit: a b h p q r | |
239 |
|
239 | |||
240 | $ hg up -q null |
|
240 | $ hg up -q null | |
241 |
|
241 | |||
@@ -281,7 +281,7 b' merging with unrelated change does not i' | |||||
281 | | |
|
281 | | | |
282 | o i-1: a -move-> c, p -move-> s |
|
282 | o i-1: a -move-> c, p -move-> s | |
283 | | |
|
283 | | | |
284 | o i-0 initial commit: a b h |
|
284 | o i-0 initial commit: a b h p q r | |
285 |
|
285 | |||
286 |
|
286 | |||
287 |
|
287 | |||
@@ -331,7 +331,7 b' and recreate an unrelated file after the' | |||||
331 | | |
|
331 | | | |
332 | o i-1: a -move-> c, p -move-> s |
|
332 | o i-1: a -move-> c, p -move-> s | |
333 | | |
|
333 | | | |
334 | o i-0 initial commit: a b h |
|
334 | o i-0 initial commit: a b h p q r | |
335 |
|
335 | |||
336 |
|
336 | |||
337 | Comparing with a merge re-adding the file afterward |
|
337 | Comparing with a merge re-adding the file afterward | |
@@ -371,7 +371,7 b' Merge:' | |||||
371 | | |
|
371 | | | |
372 | o i-1: a -move-> c, p -move-> s |
|
372 | o i-1: a -move-> c, p -move-> s | |
373 | | |
|
373 | | | |
374 | o i-0 initial commit: a b h |
|
374 | o i-0 initial commit: a b h p q r | |
375 |
|
375 | |||
376 |
|
376 | |||
377 |
|
377 | |||
@@ -419,7 +419,7 b' Subcase: new copy information on both si' | |||||
419 | | |
|
419 | | | |
420 | o i-1: a -move-> c, p -move-> s |
|
420 | o i-1: a -move-> c, p -move-> s | |
421 | | |
|
421 | | | |
422 | o i-0 initial commit: a b h |
|
422 | o i-0 initial commit: a b h p q r | |
423 |
|
423 | |||
424 |
|
424 | |||
425 | Subcase: new copy information on both side with an actual merge happening |
|
425 | Subcase: new copy information on both side with an actual merge happening | |
@@ -462,7 +462,7 b' Subcase: new copy information on both si' | |||||
462 | | |
|
462 | | | |
463 | o i-1: a -move-> c, p -move-> s |
|
463 | o i-1: a -move-> c, p -move-> s | |
464 | | |
|
464 | | | |
465 | o i-0 initial commit: a b h |
|
465 | o i-0 initial commit: a b h p q r | |
466 |
|
466 | |||
467 |
|
467 | |||
468 | Subcase: existing copy information overwritten on one branch |
|
468 | Subcase: existing copy information overwritten on one branch | |
@@ -518,7 +518,7 b' Merge:' | |||||
518 | | |
|
518 | | | |
519 | o i-1: a -move-> c, p -move-> s |
|
519 | o i-1: a -move-> c, p -move-> s | |
520 | | |
|
520 | | | |
521 | o i-0 initial commit: a b h |
|
521 | o i-0 initial commit: a b h p q r | |
522 |
|
522 | |||
523 |
|
523 | |||
524 | Subcase: existing copy information overwritten on one branch, with different content) |
|
524 | Subcase: existing copy information overwritten on one branch, with different content) | |
@@ -572,7 +572,7 b' Merge:' | |||||
572 | | |
|
572 | | | |
573 | o i-1: a -move-> c, p -move-> s |
|
573 | o i-1: a -move-> c, p -move-> s | |
574 | | |
|
574 | | | |
575 | o i-0 initial commit: a b h |
|
575 | o i-0 initial commit: a b h p q r | |
576 |
|
576 | |||
577 |
|
577 | |||
578 |
|
578 | |||
@@ -623,7 +623,7 b' consider history and rename on both bran' | |||||
623 | | |
|
623 | | | |
624 | o i-1: a -move-> c, p -move-> s |
|
624 | o i-1: a -move-> c, p -move-> s | |
625 | | |
|
625 | | | |
626 | o i-0 initial commit: a b h |
|
626 | o i-0 initial commit: a b h p q r | |
627 |
|
627 | |||
628 |
|
628 | |||
629 | Subcase: merging a change to a file with a "copy overwrite" to that file from another branch |
|
629 | Subcase: merging a change to a file with a "copy overwrite" to that file from another branch | |
@@ -678,7 +678,7 b' Note:' | |||||
678 | | |
|
678 | | | |
679 | o i-1: a -move-> c, p -move-> s |
|
679 | o i-1: a -move-> c, p -move-> s | |
680 | | |
|
680 | | | |
681 | o i-0 initial commit: a b h |
|
681 | o i-0 initial commit: a b h p q r | |
682 |
|
682 | |||
683 |
|
683 | |||
684 |
|
684 | |||
@@ -736,7 +736,7 b' copy tracing chain.' | |||||
736 | | |
|
736 | | | |
737 | o i-1: a -move-> c, p -move-> s |
|
737 | o i-1: a -move-> c, p -move-> s | |
738 | | |
|
738 | | | |
739 | o i-0 initial commit: a b h |
|
739 | o i-0 initial commit: a b h p q r | |
740 |
|
740 | |||
741 |
|
741 | |||
742 |
|
742 | |||
@@ -785,7 +785,7 b' copy tracing chain.' | |||||
785 | | |
|
785 | | | |
786 | o i-1: a -move-> c, p -move-> s |
|
786 | o i-1: a -move-> c, p -move-> s | |
787 | | |
|
787 | | | |
788 | o i-0 initial commit: a b h |
|
788 | o i-0 initial commit: a b h p q r | |
789 |
|
789 | |||
790 |
|
790 | |||
791 |
|
791 | |||
@@ -834,7 +834,7 b' rename information actually conflict wit' | |||||
834 | | | |
|
834 | | | | |
835 | o | i-1: a -move-> c, p -move-> s |
|
835 | o | i-1: a -move-> c, p -move-> s | |
836 | |/ |
|
836 | |/ | |
837 | o i-0 initial commit: a b h |
|
837 | o i-0 initial commit: a b h p q r | |
838 |
|
838 | |||
839 |
|
839 | |||
840 | Variant of previous with extra changes introduced by the merge |
|
840 | Variant of previous with extra changes introduced by the merge | |
@@ -888,7 +888,7 b' Same as `mAEm` and `mEAm` but with extra' | |||||
888 | | |
|
888 | | | |
889 | o i-1: a -move-> c, p -move-> s |
|
889 | o i-1: a -move-> c, p -move-> s | |
890 | | |
|
890 | | | |
891 | o i-0 initial commit: a b h |
|
891 | o i-0 initial commit: a b h p q r | |
892 |
|
892 | |||
893 |
|
893 | |||
894 | Decision from previous merge are properly chained with later merge |
|
894 | Decision from previous merge are properly chained with later merge | |
@@ -995,7 +995,7 b' about that file should stay unchanged.' | |||||
995 | | |
|
995 | | | |
996 | o i-1: a -move-> c, p -move-> s |
|
996 | o i-1: a -move-> c, p -move-> s | |
997 | | |
|
997 | | | |
998 | o i-0 initial commit: a b h |
|
998 | o i-0 initial commit: a b h p q r | |
999 |
|
999 | |||
1000 |
|
1000 | |||
1001 | Subcase: chaining conflicting rename resolution, with actual merging happening |
|
1001 | Subcase: chaining conflicting rename resolution, with actual merging happening | |
@@ -1094,7 +1094,7 b' about that file should stay unchanged.' | |||||
1094 | | |
|
1094 | | | |
1095 | o i-1: a -move-> c, p -move-> s |
|
1095 | o i-1: a -move-> c, p -move-> s | |
1096 | | |
|
1096 | | | |
1097 | o i-0 initial commit: a b h |
|
1097 | o i-0 initial commit: a b h p q r | |
1098 |
|
1098 | |||
1099 |
|
1099 | |||
1100 | Subcase: chaining salvage information during a merge |
|
1100 | Subcase: chaining salvage information during a merge | |
@@ -1177,7 +1177,7 b' should preserve the fact eh file was sal' | |||||
1177 | | |
|
1177 | | | |
1178 | o i-1: a -move-> c, p -move-> s |
|
1178 | o i-1: a -move-> c, p -move-> s | |
1179 | | |
|
1179 | | | |
1180 | o i-0 initial commit: a b h |
|
1180 | o i-0 initial commit: a b h p q r | |
1181 |
|
1181 | |||
1182 |
|
1182 | |||
1183 |
|
1183 | |||
@@ -1273,7 +1273,7 b' When a non-rename change are merged with' | |||||
1273 | | |
|
1273 | | | |
1274 | o i-1: a -move-> c, p -move-> s |
|
1274 | o i-1: a -move-> c, p -move-> s | |
1275 | | |
|
1275 | | | |
1276 | o i-0 initial commit: a b h |
|
1276 | o i-0 initial commit: a b h p q r | |
1277 |
|
1277 | |||
1278 |
|
1278 | |||
1279 | Subcase: chaining conflicting rename resolution, with extra change during the merge |
|
1279 | Subcase: chaining conflicting rename resolution, with extra change during the merge | |
@@ -1356,7 +1356,7 b' about that file should stay unchanged.' | |||||
1356 | | |
|
1356 | | | |
1357 | o i-1: a -move-> c, p -move-> s |
|
1357 | o i-1: a -move-> c, p -move-> s | |
1358 | | |
|
1358 | | | |
1359 | o i-0 initial commit: a b h |
|
1359 | o i-0 initial commit: a b h p q r | |
1360 |
|
1360 | |||
1361 |
|
1361 | |||
1362 | Summary of all created cases |
|
1362 | Summary of all created cases | |
@@ -1379,7 +1379,7 b' Summary of all created cases' | |||||
1379 | f-2: rename i -> d |
|
1379 | f-2: rename i -> d | |
1380 | g-1: update d |
|
1380 | g-1: update d | |
1381 | h-1: b -(move)-> d |
|
1381 | h-1: b -(move)-> d | |
1382 | i-0 initial commit: a b h |
|
1382 | i-0 initial commit: a b h p q r | |
1383 | i-1: a -move-> c, p -move-> s |
|
1383 | i-1: a -move-> c, p -move-> s | |
1384 | i-2: c -move-> d, s -move-> t |
|
1384 | i-2: c -move-> d, s -move-> t | |
1385 | j-1: unrelated changes (based on the "a" series of changes) |
|
1385 | j-1: unrelated changes (based on the "a" series of changes) | |
@@ -1919,7 +1919,7 b' merging with unrelated change does not i' | |||||
1919 | | |
|
1919 | | | |
1920 | o i-1: a -move-> c, p -move-> s |
|
1920 | o i-1: a -move-> c, p -move-> s | |
1921 | | |
|
1921 | | | |
1922 | o i-0 initial commit: a b h |
|
1922 | o i-0 initial commit: a b h p q r | |
1923 |
|
1923 | |||
1924 |
|
1924 | |||
1925 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")' |
|
1925 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")' | |
@@ -1986,7 +1986,7 b' and recreate an unrelated file after the' | |||||
1986 | | |
|
1986 | | | |
1987 | o i-1: a -move-> c, p -move-> s |
|
1987 | o i-1: a -move-> c, p -move-> s | |
1988 | | |
|
1988 | | | |
1989 | o i-0 initial commit: a b h |
|
1989 | o i-0 initial commit: a b h p q r | |
1990 |
|
1990 | |||
1991 | - comparing from the merge |
|
1991 | - comparing from the merge | |
1992 |
|
1992 | |||
@@ -2072,7 +2072,7 b' Merge:' | |||||
2072 | | |
|
2072 | | | |
2073 | o i-1: a -move-> c, p -move-> s |
|
2073 | o i-1: a -move-> c, p -move-> s | |
2074 | | |
|
2074 | | | |
2075 | o i-0 initial commit: a b h |
|
2075 | o i-0 initial commit: a b h p q r | |
2076 |
|
2076 | |||
2077 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")' |
|
2077 | $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")' | |
2078 | M d |
|
2078 | M d | |
@@ -2163,7 +2163,7 b' Subcase: new copy information on both si' | |||||
2163 | | |
|
2163 | | | |
2164 | o i-1: a -move-> c, p -move-> s |
|
2164 | o i-1: a -move-> c, p -move-> s | |
2165 | | |
|
2165 | | | |
2166 | o i-0 initial commit: a b h |
|
2166 | o i-0 initial commit: a b h p q r | |
2167 |
|
2167 | |||
2168 | #if no-changeset |
|
2168 | #if no-changeset | |
2169 | $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' |
|
2169 | $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' | |
@@ -2294,7 +2294,7 b' Merge:' | |||||
2294 | | |
|
2294 | | | |
2295 | o i-1: a -move-> c, p -move-> s |
|
2295 | o i-1: a -move-> c, p -move-> s | |
2296 | | |
|
2296 | | | |
2297 | o i-0 initial commit: a b h |
|
2297 | o i-0 initial commit: a b h p q r | |
2298 |
|
2298 | |||
2299 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' |
|
2299 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' | |
2300 | M b |
|
2300 | M b | |
@@ -2343,7 +2343,7 b' Merge:' | |||||
2343 | | |
|
2343 | | | |
2344 | o f-1: rename h -> i |
|
2344 | o f-1: rename h -> i | |
2345 | : |
|
2345 | : | |
2346 | o i-0 initial commit: a b h |
|
2346 | o i-0 initial commit: a b h p q r | |
2347 |
|
2347 | |||
2348 | #else |
|
2348 | #else | |
2349 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
2349 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
@@ -2359,7 +2359,7 b' BROKEN: `hg log --follow <file>` relies ' | |||||
2359 | | |
|
2359 | | | |
2360 | o f-1: rename h -> i |
|
2360 | o f-1: rename h -> i | |
2361 | : |
|
2361 | : | |
2362 | o i-0 initial commit: a b h |
|
2362 | o i-0 initial commit: a b h p q r | |
2363 |
|
2363 | |||
2364 | #else |
|
2364 | #else | |
2365 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
2365 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
@@ -2392,7 +2392,7 b' Merge:' | |||||
2392 | | |
|
2392 | | | |
2393 | o i-1: a -move-> c, p -move-> s |
|
2393 | o i-1: a -move-> c, p -move-> s | |
2394 | | |
|
2394 | | | |
2395 | o i-0 initial commit: a b h |
|
2395 | o i-0 initial commit: a b h p q r | |
2396 |
|
2396 | |||
2397 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBRm-0")' |
|
2397 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBRm-0")' | |
2398 | M b |
|
2398 | M b | |
@@ -2441,7 +2441,7 b' Merge:' | |||||
2441 | | |
|
2441 | | | |
2442 | o i-1: a -move-> c, p -move-> s |
|
2442 | o i-1: a -move-> c, p -move-> s | |
2443 | | |
|
2443 | | | |
2444 | o i-0 initial commit: a b h |
|
2444 | o i-0 initial commit: a b h p q r | |
2445 |
|
2445 | |||
2446 | #else |
|
2446 | #else | |
2447 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
2447 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
@@ -2457,7 +2457,7 b' BROKEN: `hg log --follow <file>` relies ' | |||||
2457 | | |
|
2457 | | | |
2458 | o i-1: a -move-> c, p -move-> s |
|
2458 | o i-1: a -move-> c, p -move-> s | |
2459 | | |
|
2459 | | | |
2460 | o i-0 initial commit: a b h |
|
2460 | o i-0 initial commit: a b h p q r | |
2461 |
|
2461 | |||
2462 | #else |
|
2462 | #else | |
2463 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
2463 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
@@ -2492,7 +2492,7 b' consider history and rename on both bran' | |||||
2492 | | |
|
2492 | | | |
2493 | o i-1: a -move-> c, p -move-> s |
|
2493 | o i-1: a -move-> c, p -move-> s | |
2494 | | |
|
2494 | | | |
2495 | o i-0 initial commit: a b h |
|
2495 | o i-0 initial commit: a b h p q r | |
2496 |
|
2496 | |||
2497 | One side of the merge have a long history with rename. The other side of the |
|
2497 | One side of the merge have a long history with rename. The other side of the | |
2498 | merge point to a new file with a smaller history. Each side is "valid". |
|
2498 | merge point to a new file with a smaller history. Each side is "valid". | |
@@ -2535,7 +2535,7 b' revision numbers)' | |||||
2535 | | |
|
2535 | | | |
2536 | o i-1: a -move-> c, p -move-> s |
|
2536 | o i-1: a -move-> c, p -move-> s | |
2537 | | |
|
2537 | | | |
2538 | o i-0 initial commit: a b h |
|
2538 | o i-0 initial commit: a b h p q r | |
2539 |
|
2539 | |||
2540 | #else |
|
2540 | #else | |
2541 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
2541 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
@@ -2564,7 +2564,7 b' BROKEN: `hg log --follow <file>` relies ' | |||||
2564 | | |
|
2564 | | | |
2565 | o i-1: a -move-> c, p -move-> s |
|
2565 | o i-1: a -move-> c, p -move-> s | |
2566 | | |
|
2566 | | | |
2567 | o i-0 initial commit: a b h |
|
2567 | o i-0 initial commit: a b h p q r | |
2568 |
|
2568 | |||
2569 | #else |
|
2569 | #else | |
2570 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
2570 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
@@ -2606,7 +2606,7 b' history are relevant.' | |||||
2606 | | |
|
2606 | | | |
2607 | o i-1: a -move-> c, p -move-> s |
|
2607 | o i-1: a -move-> c, p -move-> s | |
2608 | | |
|
2608 | | | |
2609 | o i-0 initial commit: a b h |
|
2609 | o i-0 initial commit: a b h p q r | |
2610 |
|
2610 | |||
2611 |
|
2611 | |||
2612 | Note: |
|
2612 | Note: | |
@@ -2688,7 +2688,7 b' Copy tracing data on the resulting merge' | |||||
2688 | | |
|
2688 | | | |
2689 | o i-1: a -move-> c, p -move-> s |
|
2689 | o i-1: a -move-> c, p -move-> s | |
2690 | | |
|
2690 | | | |
2691 | o i-0 initial commit: a b h |
|
2691 | o i-0 initial commit: a b h p q r | |
2692 |
|
2692 | |||
2693 | #else |
|
2693 | #else | |
2694 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
2694 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
@@ -2714,7 +2714,7 b' BROKEN: `hg log --follow <file>` relies ' | |||||
2714 | | |
|
2714 | | | |
2715 | o i-1: a -move-> c, p -move-> s |
|
2715 | o i-1: a -move-> c, p -move-> s | |
2716 | | |
|
2716 | | | |
2717 | o i-0 initial commit: a b h |
|
2717 | o i-0 initial commit: a b h p q r | |
2718 |
|
2718 | |||
2719 | #else |
|
2719 | #else | |
2720 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
2720 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
@@ -2750,7 +2750,7 b' Subcase: new copy information on both si' | |||||
2750 | | |
|
2750 | | | |
2751 | o i-1: a -move-> c, p -move-> s |
|
2751 | o i-1: a -move-> c, p -move-> s | |
2752 | | |
|
2752 | | | |
2753 | o i-0 initial commit: a b h |
|
2753 | o i-0 initial commit: a b h p q r | |
2754 |
|
2754 | |||
2755 |
|
2755 | |||
2756 | #if no-changeset |
|
2756 | #if no-changeset | |
@@ -2879,7 +2879,7 b' copy tracing chain.' | |||||
2879 | | |
|
2879 | | | |
2880 | o i-1: a -move-> c, p -move-> s |
|
2880 | o i-1: a -move-> c, p -move-> s | |
2881 | | |
|
2881 | | | |
2882 | o i-0 initial commit: a b h |
|
2882 | o i-0 initial commit: a b h p q r | |
2883 |
|
2883 | |||
2884 |
|
2884 | |||
2885 | 'a' is the copy source of 'd' |
|
2885 | 'a' is the copy source of 'd' | |
@@ -2930,7 +2930,7 b' copy tracing chain.' | |||||
2930 | | |
|
2930 | | | |
2931 | o i-1: a -move-> c, p -move-> s |
|
2931 | o i-1: a -move-> c, p -move-> s | |
2932 | | |
|
2932 | | | |
2933 | o i-0 initial commit: a b h |
|
2933 | o i-0 initial commit: a b h p q r | |
2934 |
|
2934 | |||
2935 |
|
2935 | |||
2936 | 'a' is the the copy source of 'd' |
|
2936 | 'a' is the the copy source of 'd' | |
@@ -2982,7 +2982,7 b' rename information actually conflict wit' | |||||
2982 | | | |
|
2982 | | | | |
2983 | o | i-1: a -move-> c, p -move-> s |
|
2983 | o | i-1: a -move-> c, p -move-> s | |
2984 | |/ |
|
2984 | |/ | |
2985 | o i-0 initial commit: a b h |
|
2985 | o i-0 initial commit: a b h p q r | |
2986 |
|
2986 | |||
2987 |
|
2987 | |||
2988 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")' |
|
2988 | $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")' | |
@@ -3049,7 +3049,7 b' Subcase: merge has same initial content ' | |||||
3049 | | |
|
3049 | | | |
3050 | o i-1: a -move-> c, p -move-> s |
|
3050 | o i-1: a -move-> c, p -move-> s | |
3051 | | |
|
3051 | | | |
3052 | o i-0 initial commit: a b h |
|
3052 | o i-0 initial commit: a b h p q r | |
3053 |
|
3053 | |||
3054 | #if no-changeset |
|
3054 | #if no-changeset | |
3055 | $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f' |
|
3055 | $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f' |
General Comments 0
You need to be logged in to leave comments.
Login now