Show More
@@ -579,13 +579,15 b' Merge:' | |||||
579 | In this case, the file keep on living after the merge. So we should not drop its |
|
579 | In this case, the file keep on living after the merge. So we should not drop its | |
580 | copy tracing chain. |
|
580 | copy tracing chain. | |
581 |
|
581 | |||
|
582 | $ case_desc="merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge)" | |||
|
583 | ||||
582 | $ hg up 'desc("c-1")' |
|
584 | $ hg up 'desc("c-1")' | |
583 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
585 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
584 | $ hg merge 'desc("b-1")' |
|
586 | $ hg merge 'desc("b-1")' | |
585 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
587 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
586 | (branch merge, don't forget to commit) |
|
588 | (branch merge, don't forget to commit) | |
587 | $ hg revert --rev 'desc("b-1")' d |
|
589 | $ hg revert --rev 'desc("b-1")' d | |
588 | $ hg ci -m "mCB-revert-m-0" |
|
590 | $ hg ci -m "mCB-revert-m-0 $case_desc - one way" | |
589 | created new head |
|
591 | created new head | |
590 |
|
592 | |||
591 | $ hg up 'desc("b-1")' |
|
593 | $ hg up 'desc("b-1")' | |
@@ -594,13 +596,13 b' copy tracing chain.' | |||||
594 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
596 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
595 | (branch merge, don't forget to commit) |
|
597 | (branch merge, don't forget to commit) | |
596 | $ hg revert --rev 'desc("b-1")' d |
|
598 | $ hg revert --rev 'desc("b-1")' d | |
597 | $ hg ci -m "mBC-revert-m-0" |
|
599 | $ hg ci -m "mBC-revert-m-0 $case_desc - the other way" | |
598 | created new head |
|
600 | created new head | |
599 |
|
601 | |||
600 | $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' |
|
602 | $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' | |
601 | @ 33 mBC-revert-m-0 |
|
603 | @ 33 mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way | |
602 | |\ |
|
604 | |\ | |
603 | +---o 32 mCB-revert-m-0 |
|
605 | +---o 32 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way | |
604 | | |/ |
|
606 | | |/ | |
605 | | o 6 c-1 delete d |
|
607 | | o 6 c-1 delete d | |
606 | | | |
|
608 | | | | |
@@ -687,12 +689,12 b' Summary of all created cases' | |||||
687 | mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way |
|
689 | mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way | |
688 | mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way |
|
690 | mAEm-0 merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f) - one way | |
689 | mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way |
|
691 | mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way | |
690 | mBC-revert-m-0 |
|
692 | mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way | |
691 | mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
|
693 | mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way | |
692 | mBCm-1 re-add d |
|
694 | mBCm-1 re-add d | |
693 | mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way |
|
695 | mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way | |
694 | mBFm-0 simple merge - one way |
|
696 | mBFm-0 simple merge - one way | |
695 | mCB-revert-m-0 |
|
697 | mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way | |
696 | mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
|
698 | mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way | |
697 | mCBm-1 re-add d |
|
699 | mCBm-1 re-add d | |
698 | mCGm-0 merge updated/deleted - revive the file (updated content) - one way |
|
700 | mCGm-0 merge updated/deleted - revive the file (updated content) - one way | |
@@ -1694,9 +1696,9 b' In this case, the file keep on living af' | |||||
1694 | copy tracing chain. |
|
1696 | copy tracing chain. | |
1695 |
|
1697 | |||
1696 | $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' |
|
1698 | $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' | |
1697 | o 33 mBC-revert-m-0 |
|
1699 | o 33 mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way | |
1698 | |\ |
|
1700 | |\ | |
1699 | +---o 32 mCB-revert-m-0 |
|
1701 | +---o 32 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way | |
1700 | | |/ |
|
1702 | | |/ | |
1701 | | o 6 c-1 delete d |
|
1703 | | o 6 c-1 delete d | |
1702 | | | |
|
1704 | | | |
General Comments 0
You need to be logged in to leave comments.
Login now