equal
deleted
inserted
replaced
630 |
630 |
631 |
631 |
632 |
632 |
633 Summary of all created cases |
633 Summary of all created cases |
634 ---------------------------- |
634 ---------------------------- |
|
635 |
|
636 $ hg up --quiet null |
635 |
637 |
636 (This exists to help keeping a compact list of the various cases we have built) |
638 (This exists to help keeping a compact list of the various cases we have built) |
637 |
639 |
638 $ hg log -T '{desc|firstline}\n'| sort |
640 $ hg log -T '{desc|firstline}\n'| sort |
639 a-1: d -move-> e |
641 a-1: d -move-> e |
1711 rename information actually conflict with the other branch. |
1713 rename information actually conflict with the other branch. |
1712 |
1714 |
1713 (the copy information from the branch that was not deleted should win). |
1715 (the copy information from the branch that was not deleted should win). |
1714 |
1716 |
1715 $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' |
1717 $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' |
1716 @ 36 mHC-delete-before-conflict-m-0 |
1718 o 36 mHC-delete-before-conflict-m-0 |
1717 |\ |
1719 |\ |
1718 +---o 35 mCH-delete-before-conflict-m-0 |
1720 +---o 35 mCH-delete-before-conflict-m-0 |
1719 | |/ |
1721 | |/ |
1720 | o 34 h-1: b -(move)-> d |
1722 | o 34 h-1: b -(move)-> d |
1721 | | |
1723 | | |