##// END OF EJS Templates
test-copies: improve description of the A+B case...
marmoute -
r47283:e2097720 default
parent child Browse files
Show More
@@ -185,7 +185,7 b' merging with unrelated change does not i'
185 185 - rename on one side
186 186 - unrelated change on the other side
187 187
188 $ case_desc="simple merge"
188 $ case_desc="simple merge - A side: multiple renames, B side: unrelated update"
189 189
190 190 $ hg up 'desc("b-1")'
191 191 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -201,9 +201,9 b' merging with unrelated change does not i'
201 201 $ hg ci -m "mABm-0 $case_desc - the other way"
202 202 created new head
203 203 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
204 @ 12 mABm-0 simple merge - the other way
204 @ 12 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
205 205 |\
206 +---o 11 mBAm-0 simple merge - one way
206 +---o 11 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
207 207 | |/
208 208 | o 5 b-1: b update
209 209 | |
@@ -682,9 +682,9 b' Summary of all created cases'
682 682 i-0 initial commit: a b h
683 683 i-1: a -move-> c
684 684 i-2: c -move-> d
685 mABm-0 simple merge - the other way
685 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
686 686 mAEm-0 simple merge - one way
687 mBAm-0 simple merge - one way
687 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
688 688 mBC-revert-m-0
689 689 mBCm-0 simple merge - one way
690 690 mBCm-1 re-add d
@@ -973,9 +973,9 b' merging with unrelated change does not i'
973 973 - unrelated change on the other side
974 974
975 975 $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
976 o 12 mABm-0 simple merge - the other way
976 o 12 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
977 977 |\
978 +---o 11 mBAm-0 simple merge - one way
978 +---o 11 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
979 979 | |/
980 980 | o 5 b-1: b update
981 981 | |
General Comments 0
You need to be logged in to leave comments. Login now