Show More
@@ -315,7 +315,7 b' Comparing with a merge with colliding re' | |||||
315 | - the "e-" branch renaming b to f (through 'g') |
|
315 | - the "e-" branch renaming b to f (through 'g') | |
316 | - the "a-" branch renaming d to f (through e) |
|
316 | - the "a-" branch renaming d to f (through e) | |
317 |
|
317 | |||
318 | $ case_desc="simple merge" |
|
318 | $ case_desc="merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)" | |
319 |
|
319 | |||
320 | $ hg up 'desc("a-2")' |
|
320 | $ hg up 'desc("a-2")' | |
321 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
321 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
@@ -334,9 +334,9 b' Comparing with a merge with colliding re' | |||||
334 | $ hg ci -m "mEAm-0 $case_desc - the other way" |
|
334 | $ hg ci -m "mEAm-0 $case_desc - the other way" | |
335 | created new head |
|
335 | created new head | |
336 | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
|
336 | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | |
337 | @ 20 mEAm-0 simple merge - the other way |
|
337 | @ 20 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 | |
338 | |\ |
|
338 | |\ | |
339 | +---o 19 mAEm-0 simple merge - one way |
|
339 | +---o 19 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 | |
340 | | |/ |
|
340 | | |/ | |
341 | | o 10 e-2 g -move-> f |
|
341 | | o 10 e-2 g -move-> f | |
342 | | | |
|
342 | | | | |
@@ -683,7 +683,7 b' Summary of all created cases' | |||||
683 | i-1: a -move-> c |
|
683 | i-1: a -move-> c | |
684 | i-2: c -move-> d |
|
684 | i-2: c -move-> d | |
685 | mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way |
|
685 | mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way | |
686 | mAEm-0 simple merge - one way |
|
686 | 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 | |
687 | mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way |
|
687 | mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way | |
688 | mBC-revert-m-0 |
|
688 | mBC-revert-m-0 | |
689 | mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way |
|
689 | mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way | |
@@ -697,7 +697,7 b' Summary of all created cases' | |||||
697 | mCH-delete-before-conflict-m-0 |
|
697 | 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 |
|
698 | mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way | |
699 | mDGm-0 simple merge - one way |
|
699 | mDGm-0 simple merge - one way | |
700 | mEAm-0 simple merge - the other 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 | |
701 | mFBm-0 simple merge - the other way |
|
701 | mFBm-0 simple merge - the other way | |
702 | mFGm-0 simple merge - one way |
|
702 | mFGm-0 simple merge - one way | |
703 | mGCm-0 |
|
703 | mGCm-0 | |
@@ -1188,9 +1188,9 b' Comparing with a merge with colliding re' | |||||
1188 | - the "a-" branch renaming d to f (through e) |
|
1188 | - the "a-" branch renaming d to f (through e) | |
1189 |
|
1189 | |||
1190 | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' |
|
1190 | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | |
1191 | o 20 mEAm-0 simple merge - the other way |
|
1191 | o 20 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 | |
1192 | |\ |
|
1192 | |\ | |
1193 | +---o 19 mAEm-0 simple merge - one way |
|
1193 | +---o 19 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 | |
1194 | | |/ |
|
1194 | | |/ | |
1195 | | o 10 e-2 g -move-> f |
|
1195 | | o 10 e-2 g -move-> f | |
1196 | | | |
|
1196 | | | |
General Comments 0
You need to be logged in to leave comments.
Login now