Show More
@@ -626,6 +626,8 b' rename information actually conflict wit' | |||||
626 |
|
626 | |||
627 | (the copy information from the branch that was not deleted should win). |
|
627 | (the copy information from the branch that was not deleted should win). | |
628 |
|
628 | |||
|
629 | $ case_desc="simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch)" | |||
|
630 | ||||
629 | $ hg up 'desc("i-0")' |
|
631 | $ hg up 'desc("i-0")' | |
630 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
632 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
631 | $ hg mv b d |
|
633 | $ hg mv b d | |
@@ -637,19 +639,19 b' rename information actually conflict wit' | |||||
637 | $ hg merge 'desc("h-1")' |
|
639 | $ hg merge 'desc("h-1")' | |
638 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
640 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
639 | (branch merge, don't forget to commit) |
|
641 | (branch merge, don't forget to commit) | |
640 | $ hg ci -m "mCH-delete-before-conflict-m-0" |
|
642 | $ hg ci -m "mCH-delete-before-conflict-m-0 $case_desc - one way" | |
641 |
|
643 | |||
642 | $ hg up 'desc("h-1")' |
|
644 | $ hg up 'desc("h-1")' | |
643 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
645 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
644 | $ hg merge 'desc("c-1")' |
|
646 | $ hg merge 'desc("c-1")' | |
645 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
647 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
646 | (branch merge, don't forget to commit) |
|
648 | (branch merge, don't forget to commit) | |
647 | $ hg ci -m "mHC-delete-before-conflict-m-0" |
|
649 | $ hg ci -m "mHC-delete-before-conflict-m-0 $case_desc - the other way" | |
648 | created new head |
|
650 | created new head | |
649 | $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' |
|
651 | $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' | |
650 | @ 36 mHC-delete-before-conflict-m-0 |
|
652 | @ 36 mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way | |
651 | |\ |
|
653 | |\ | |
652 | +---o 35 mCH-delete-before-conflict-m-0 |
|
654 | +---o 35 mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way | |
653 | | |/ |
|
655 | | |/ | |
654 | | o 34 h-1: b -(move)-> d |
|
656 | | o 34 h-1: b -(move)-> d | |
655 | | | |
|
657 | | | | |
@@ -698,7 +700,7 b' Summary of all created cases' | |||||
698 | mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way |
|
700 | mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way | |
699 | mCBm-1 re-add d |
|
701 | mCBm-1 re-add d | |
700 | mCGm-0 merge updated/deleted - revive the file (updated content) - one way |
|
702 | mCGm-0 merge updated/deleted - revive the file (updated content) - one way | |
701 | mCH-delete-before-conflict-m-0 |
|
703 | mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way | |
702 | mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way |
|
704 | mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way | |
703 | mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way |
|
705 | mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way | |
704 | 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 |
|
706 | 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 | |
@@ -707,7 +709,7 b' Summary of all created cases' | |||||
707 | mGCm-0 merge updated/deleted - revive the file (updated content) - the other way |
|
709 | mGCm-0 merge updated/deleted - revive the file (updated content) - the other way | |
708 | mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way |
|
710 | mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way | |
709 | mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way |
|
711 | mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way | |
710 | mHC-delete-before-conflict-m-0 |
|
712 | mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way | |
711 |
|
713 | |||
712 |
|
714 | |||
713 | Test that sidedata computations during upgrades are correct |
|
715 | Test that sidedata computations during upgrades are correct | |
@@ -1742,9 +1744,9 b' rename information actually conflict wit' | |||||
1742 | (the copy information from the branch that was not deleted should win). |
|
1744 | (the copy information from the branch that was not deleted should win). | |
1743 |
|
1745 | |||
1744 | $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' |
|
1746 | $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' | |
1745 | o 36 mHC-delete-before-conflict-m-0 |
|
1747 | o 36 mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way | |
1746 | |\ |
|
1748 | |\ | |
1747 | +---o 35 mCH-delete-before-conflict-m-0 |
|
1749 | +---o 35 mCH-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - one way | |
1748 | | |/ |
|
1750 | | |/ | |
1749 | | o 34 h-1: b -(move)-> d |
|
1751 | | o 34 h-1: b -(move)-> d | |
1750 | | | |
|
1752 | | | |
General Comments 0
You need to be logged in to leave comments.
Login now