Show More
@@ -414,7 +414,7 b' Merge:' | |||||
414 | Unlike in the 'BD/DB' cases, an actual merge happened here. So we should |
|
414 | Unlike in the 'BD/DB' cases, an actual merge happened here. So we should | |
415 | consider history and rename on both branch of the merge. |
|
415 | consider history and rename on both branch of the merge. | |
416 |
|
416 | |||
417 | $ case_desc="simple merge" |
|
417 | $ case_desc="actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content" | |
418 |
|
418 | |||
419 | $ hg up 'desc("i-2")' |
|
419 | $ hg up 'desc("i-2")' | |
420 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) |
|
420 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) | |
@@ -438,9 +438,9 b' consider history and rename on both bran' | |||||
438 | $ hg ci -m "mGDm-0 $case_desc - the other way" |
|
438 | $ hg ci -m "mGDm-0 $case_desc - the other way" | |
439 | created new head |
|
439 | created new head | |
440 | $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
|
440 | $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' | |
441 | @ 27 mGDm-0 simple merge - the other way |
|
441 | @ 27 mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way | |
442 | |\ |
|
442 | |\ | |
443 | +---o 26 mDGm-0 simple merge - one way |
|
443 | +---o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
444 | | |/ |
|
444 | | |/ | |
445 | | o 25 g-1: update d |
|
445 | | o 25 g-1: update d | |
446 | | | |
|
446 | | | | |
@@ -696,12 +696,12 b' Summary of all created cases' | |||||
696 | mCGm-0 |
|
696 | mCGm-0 | |
697 | mCH-delete-before-conflict-m-0 |
|
697 | mCH-delete-before-conflict-m-0 | |
698 | mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way |
|
698 | mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way | |
699 | mDGm-0 simple merge - one way |
|
699 | mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
700 | mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way |
|
700 | mEAm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - the other way | |
701 | mFBm-0 simple merge - the other way |
|
701 | mFBm-0 simple merge - the other way | |
702 | mFGm-0 simple merge - one way |
|
702 | mFGm-0 simple merge - one way | |
703 | mGCm-0 |
|
703 | mGCm-0 | |
704 | mGDm-0 simple merge - the other way |
|
704 | mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way | |
705 | mGFm-0 simple merge - the other way |
|
705 | mGFm-0 simple merge - the other way | |
706 | mHC-delete-before-conflict-m-0 |
|
706 | mHC-delete-before-conflict-m-0 | |
707 |
|
707 | |||
@@ -1400,9 +1400,9 b" Unlike in the 'BD/DB' cases, an actual m" | |||||
1400 | consider history and rename on both branch of the merge. |
|
1400 | consider history and rename on both branch of the merge. | |
1401 |
|
1401 | |||
1402 | $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' |
|
1402 | $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' | |
1403 | o 27 mGDm-0 simple merge - the other way |
|
1403 | o 27 mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way | |
1404 | |\ |
|
1404 | |\ | |
1405 | +---o 26 mDGm-0 simple merge - one way |
|
1405 | +---o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
1406 | | |/ |
|
1406 | | |/ | |
1407 | | o 25 g-1: update d |
|
1407 | | o 25 g-1: update d | |
1408 | | | |
|
1408 | | | | |
@@ -1456,7 +1456,7 b' revision numbers)' | |||||
1456 | #else |
|
1456 | #else | |
1457 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
1457 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
1458 | $ hg log -Gfr 'desc("mDGm-0")' d |
|
1458 | $ hg log -Gfr 'desc("mDGm-0")' d | |
1459 | o 26 mDGm-0 simple merge - one way |
|
1459 | o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
1460 | |\ |
|
1460 | |\ | |
1461 | | o 25 g-1: update d |
|
1461 | | o 25 g-1: update d | |
1462 | | | |
|
1462 | | | | |
@@ -1485,7 +1485,7 b' BROKEN: `hg log --follow <file>` relies ' | |||||
1485 | #else |
|
1485 | #else | |
1486 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work |
|
1486 | BROKEN: `hg log --follow <file>` relies on filelog metadata to work | |
1487 | $ hg log -Gfr 'desc("mDGm-0")' d |
|
1487 | $ hg log -Gfr 'desc("mDGm-0")' d | |
1488 | o 26 mDGm-0 simple merge - one way |
|
1488 | o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
1489 | |\ |
|
1489 | |\ | |
1490 | | o 25 g-1: update d |
|
1490 | | o 25 g-1: update d | |
1491 | | | |
|
1491 | | | |
General Comments 0
You need to be logged in to leave comments.
Login now