Show More
@@ -520,6 +520,8 b' Merge:' | |||||
520 | In this case, the file keep on living after the merge. So we should not drop its |
|
520 | In this case, the file keep on living after the merge. So we should not drop its | |
521 | copy tracing chain. |
|
521 | copy tracing chain. | |
522 |
|
522 | |||
|
523 | $ case_desc="merge updated/deleted - revive the file (updated content)" | |||
|
524 | ||||
523 | $ hg up 'desc("c-1")' |
|
525 | $ hg up 'desc("c-1")' | |
524 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
526 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
525 | $ hg merge 'desc("g-1")' |
|
527 | $ hg merge 'desc("g-1")' | |
@@ -531,7 +533,7 b' copy tracing chain.' | |||||
531 | [1] |
|
533 | [1] | |
532 | $ hg resolve -t :other d |
|
534 | $ hg resolve -t :other d | |
533 | (no more unresolved files) |
|
535 | (no more unresolved files) | |
534 | $ hg ci -m "mCGm-0" |
|
536 | $ hg ci -m "mCGm-0 $case_desc - one way" | |
535 | created new head |
|
537 | created new head | |
536 |
|
538 | |||
537 | $ hg up 'desc("g-1")' |
|
539 | $ hg up 'desc("g-1")' | |
@@ -545,13 +547,13 b' copy tracing chain.' | |||||
545 | [1] |
|
547 | [1] | |
546 | $ hg resolve -t :local d |
|
548 | $ hg resolve -t :local d | |
547 | (no more unresolved files) |
|
549 | (no more unresolved files) | |
548 | $ hg ci -m "mGCm-0" |
|
550 | $ hg ci -m "mGCm-0 $case_desc - the other way" | |
549 | created new head |
|
551 | created new head | |
550 |
|
552 | |||
551 | $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' |
|
553 | $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' | |
552 | @ 31 mGCm-0 |
|
554 | @ 31 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way | |
553 | |\ |
|
555 | |\ | |
554 | +---o 30 mCGm-0 |
|
556 | +---o 30 mCGm-0 merge updated/deleted - revive the file (updated content) - one way | |
555 | | |/ |
|
557 | | |/ | |
556 | | o 25 g-1: update d |
|
558 | | o 25 g-1: update d | |
557 | | | |
|
559 | | | | |
@@ -693,14 +695,14 b' Summary of all created cases' | |||||
693 | mCB-revert-m-0 |
|
695 | mCB-revert-m-0 | |
694 | mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
|
696 | mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way | |
695 | mCBm-1 re-add d |
|
697 | mCBm-1 re-add d | |
696 | mCGm-0 |
|
698 | mCGm-0 merge updated/deleted - revive the file (updated content) - one way | |
697 | mCH-delete-before-conflict-m-0 |
|
699 | 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 |
|
700 | mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other 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 |
|
701 | 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 |
|
702 | 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 |
|
703 | mFBm-0 simple merge - the other way | |
702 | mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way |
|
704 | mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way | |
703 | mGCm-0 |
|
705 | mGCm-0 merge updated/deleted - revive the file (updated content) - 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 |
|
706 | 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 merge - G side: content change, F side: copy overwrite, no content change - the other way |
|
707 | mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way | |
706 | mHC-delete-before-conflict-m-0 |
|
708 | mHC-delete-before-conflict-m-0 | |
@@ -1647,9 +1649,9 b' In this case, the file keep on living af' | |||||
1647 | copy tracing chain. |
|
1649 | copy tracing chain. | |
1648 |
|
1650 | |||
1649 | $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' |
|
1651 | $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' | |
1650 | o 31 mGCm-0 |
|
1652 | o 31 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way | |
1651 | |\ |
|
1653 | |\ | |
1652 | +---o 30 mCGm-0 |
|
1654 | +---o 30 mCGm-0 merge updated/deleted - revive the file (updated content) - one way | |
1653 | | |/ |
|
1655 | | |/ | |
1654 | | o 25 g-1: update d |
|
1656 | | o 25 g-1: update d | |
1655 | | | |
|
1657 | | | |
General Comments 0
You need to be logged in to leave comments.
Login now