This will make its role clearer.
Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
This will make its role clearer.
Automatic diff as part of commit; lint not applicable. |
Automatic diff as part of commit; unit tests not applicable. |
Path | Packages | |||
---|---|---|---|---|
M | tests/test-copies-chain-merge.t (14 lines) |
Comparing with a merge with colliding rename | Comparing with a merge with colliding rename | ||||
-------------------------------------------- | -------------------------------------------- | ||||
- the "e-" branch renaming b to f (through 'g') | - the "e-" branch renaming b to f (through 'g') | ||||
- the "a-" branch renaming d to f (through e) | - the "a-" branch renaming d to f (through e) | ||||
$ case_desc="simple merge" | $ case_desc="merge with copies info on both side - A side: rename d to f, E side: b to f, (same content for f)" | ||||
$ hg up 'desc("a-2")' | $ hg up 'desc("a-2")' | ||||
2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg merge 'desc("e-2")' | $ hg merge 'desc("e-2")' | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | ||||
(branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
$ hg ci -m "mAEm-0 $case_desc - one way" | $ hg ci -m "mAEm-0 $case_desc - one way" | ||||
$ hg up 'desc("e-2")' | $ hg up 'desc("e-2")' | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) | ||||
$ hg merge 'desc("a-2")' | $ hg merge 'desc("a-2")' | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) | ||||
(branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
$ hg ci -m "mEAm-0 $case_desc - the other way" | $ hg ci -m "mEAm-0 $case_desc - the other way" | ||||
created new head | created new head | ||||
$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | ||||
@ 20 mEAm-0 simple merge - the other way | @ 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 | ||||
|\ | |\ | ||||
+---o 19 mAEm-0 simple merge - one way | +---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 | ||||
| |/ | | |/ | ||||
| o 10 e-2 g -move-> f | | o 10 e-2 g -move-> f | ||||
| | | | | | ||||
| o 9 e-1 b -move-> g | | o 9 e-1 b -move-> g | ||||
| | | | | | ||||
o | 4 a-2: e -move-> f | o | 4 a-2: e -move-> f | ||||
| | | | | | ||||
o | 3 a-1: d -move-> e | o | 3 a-1: d -move-> e | ||||
f-1: rename h -> i | f-1: rename h -> i | ||||
f-2: rename i -> d | f-2: rename i -> d | ||||
g-1: update d | g-1: update d | ||||
h-1: b -(move)-> d | h-1: b -(move)-> d | ||||
i-0 initial commit: a b h | i-0 initial commit: a b h | ||||
i-1: a -move-> c | i-1: a -move-> c | ||||
i-2: c -move-> d | i-2: c -move-> d | ||||
mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way | mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way | ||||
mAEm-0 simple merge - one way | 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 | ||||
mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way | mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way | ||||
mBC-revert-m-0 | mBC-revert-m-0 | ||||
mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way | mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way | ||||
mBCm-1 re-add d | mBCm-1 re-add d | ||||
mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way | mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way | ||||
mBFm-0 simple merge - one way | mBFm-0 simple merge - one way | ||||
mCB-revert-m-0 | mCB-revert-m-0 | ||||
mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way | mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way | ||||
mCBm-1 re-add d | mCBm-1 re-add d | ||||
mCGm-0 | mCGm-0 | ||||
mCH-delete-before-conflict-m-0 | mCH-delete-before-conflict-m-0 | ||||
mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way | mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way | ||||
mDGm-0 simple merge - one way | mDGm-0 simple merge - one way | ||||
mEAm-0 simple merge - the other way | 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 | ||||
mFBm-0 simple merge - the other way | mFBm-0 simple merge - the other way | ||||
mFGm-0 simple merge - one way | mFGm-0 simple merge - one way | ||||
mGCm-0 | mGCm-0 | ||||
mGDm-0 simple merge - the other way | mGDm-0 simple merge - the other way | ||||
mGFm-0 simple merge - the other way | mGFm-0 simple merge - the other way | ||||
mHC-delete-before-conflict-m-0 | mHC-delete-before-conflict-m-0 | ||||
Comparing with a merge with colliding rename | Comparing with a merge with colliding rename | ||||
-------------------------------------------- | -------------------------------------------- | ||||
- the "e-" branch renaming b to f (through 'g') | - the "e-" branch renaming b to f (through 'g') | ||||
- the "a-" branch renaming d to f (through e) | - the "a-" branch renaming d to f (through e) | ||||
$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | $ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))' | ||||
o 20 mEAm-0 simple merge - the other way | 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 | ||||
|\ | |\ | ||||
+---o 19 mAEm-0 simple merge - one way | +---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 | ||||
| |/ | | |/ | ||||
| o 10 e-2 g -move-> f | | o 10 e-2 g -move-> f | ||||
| | | | | | ||||
| o 9 e-1 b -move-> g | | o 9 e-1 b -move-> g | ||||
| | | | | | ||||
o | 4 a-2: e -move-> f | o | 4 a-2: e -move-> f | ||||
| | | | | | ||||
o | 3 a-1: d -move-> e | o | 3 a-1: d -move-> e |