Show More
@@ -312,6 +312,9 b' Merge:' | |||||
312 | Comparing with a merge with colliding rename |
|
312 | Comparing with a merge with colliding rename | |
313 | -------------------------------------------- |
|
313 | -------------------------------------------- | |
314 |
|
314 | |||
|
315 | Subcase: new copy information on both side | |||
|
316 | `````````````````````````````````````````` | |||
|
317 | ||||
315 | - the "e-" branch renaming b to f (through 'g') |
|
318 | - the "e-" branch renaming b to f (through 'g') | |
316 | - the "a-" branch renaming d to f (through e) |
|
319 | - the "a-" branch renaming d to f (through e) | |
317 |
|
320 | |||
@@ -353,6 +356,8 b' Comparing with a merge with colliding re' | |||||
353 | o 0 i-0 initial commit: a b h |
|
356 | o 0 i-0 initial commit: a b h | |
354 |
|
357 | |||
355 |
|
358 | |||
|
359 | Subcase: existing copy information overwritten on one branch | |||
|
360 | ```````````````````````````````````````````````````````````` | |||
356 |
|
361 | |||
357 | Merge: |
|
362 | Merge: | |
358 | - one with change to an unrelated file (b) |
|
363 | - one with change to an unrelated file (b) | |
@@ -407,6 +412,9 b' Merge:' | |||||
407 |
|
412 | |||
408 |
|
413 | |||
409 |
|
414 | |||
|
415 | Subcase: reset of the copy history on one side | |||
|
416 | `````````````````````````````````````````````` | |||
|
417 | ||||
410 | Merge: |
|
418 | Merge: | |
411 | - one with change to a file |
|
419 | - one with change to a file | |
412 | - one deleting and recreating the file |
|
420 | - one deleting and recreating the file | |
@@ -455,6 +463,8 b' consider history and rename on both bran' | |||||
455 | o 0 i-0 initial commit: a b h |
|
463 | o 0 i-0 initial commit: a b h | |
456 |
|
464 | |||
457 |
|
465 | |||
|
466 | Subcase: merging a change to a file with a "copy overwrite" to that file from another branch | |||
|
467 | ```````````````````````````````````````````````````````````````````````````````````````````` | |||
458 |
|
468 | |||
459 | Merge: |
|
469 | Merge: | |
460 | - one with change to a file (d) |
|
470 | - one with change to a file (d) | |
@@ -1190,6 +1200,9 b' Log output should not include a merge co' | |||||
1190 | Comparing with a merge with colliding rename |
|
1200 | Comparing with a merge with colliding rename | |
1191 | -------------------------------------------- |
|
1201 | -------------------------------------------- | |
1192 |
|
1202 | |||
|
1203 | Subcase: new copy information on both side | |||
|
1204 | `````````````````````````````````````````` | |||
|
1205 | ||||
1193 | - the "e-" branch renaming b to f (through 'g') |
|
1206 | - the "e-" branch renaming b to f (through 'g') | |
1194 | - the "a-" branch renaming d to f (through e) |
|
1207 | - the "a-" branch renaming d to f (through e) | |
1195 |
|
1208 | |||
@@ -1304,6 +1317,9 b' Comparing with a merge with colliding re' | |||||
1304 | R b |
|
1317 | R b | |
1305 |
|
1318 | |||
1306 |
|
1319 | |||
|
1320 | Subcase: existing copy information overwritten on one branch | |||
|
1321 | ```````````````````````````````````````````````````````````` | |||
|
1322 | ||||
1307 | Note: |
|
1323 | Note: | |
1308 | | In this case, one of the merge wrongly record a merge while there is none. |
|
1324 | | In this case, one of the merge wrongly record a merge while there is none. | |
1309 | | This lead to bad copy tracing information to be dug up. |
|
1325 | | This lead to bad copy tracing information to be dug up. | |
@@ -1397,6 +1413,8 b' BROKEN: `hg log --follow <file>` relies ' | |||||
1397 | ~ |
|
1413 | ~ | |
1398 | #endif |
|
1414 | #endif | |
1399 |
|
1415 | |||
|
1416 | Subcase: reset of the copy history on one side | |||
|
1417 | `````````````````````````````````````````````` | |||
1400 |
|
1418 | |||
1401 | Merge: |
|
1419 | Merge: | |
1402 | - one with change to a file |
|
1420 | - one with change to a file | |
@@ -1502,6 +1520,8 b' BROKEN: `hg log --follow <file>` relies ' | |||||
1502 | ~ |
|
1520 | ~ | |
1503 | #endif |
|
1521 | #endif | |
1504 |
|
1522 | |||
|
1523 | Subcase: merging a change to a file with a "copy overwrite" to that file from another branch | |||
|
1524 | ```````````````````````````````````````````````````````````````````````````````````````````` | |||
1505 |
|
1525 | |||
1506 | Merge: |
|
1526 | Merge: | |
1507 | - one with change to a file (d) |
|
1527 | - one with change to a file (d) |
General Comments 0
You need to be logged in to leave comments.
Login now