This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10048

test-copies: remove revision number from log
ClosedPublic

Authored by marmoute on Feb 22 2021, 9:34 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG74e2256a56b8: test-copies: remove revision number from log
rHG400a8f45ac7c: test-copies: remove revision number from log

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.

Event Timeline

marmoute created this revision.Feb 22 2021, 9:34 AM
baymax updated this revision to Diff 25765.Feb 22 2021, 11:34 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG400a8f45ac7c: test-copies: remove revision number from log.Feb 24 2021, 10:56 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG400a8f45ac7c: test-copies: remove revision number from log (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-chain-merge.t (549 lines)

Diff 25830

tests/test-copies-chain-merge.t

===== =====
use git diff to see rename use git diff to see rename
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [diff] > [diff]
> git=yes > git=yes
> [command-templates] > [command-templates]
> log={rev} {desc}\n > log={desc}\n
> EOF > EOF
#if compatibility #if compatibility
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [experimental] > [experimental]
> copies.read-from = compatibility > copies.read-from = compatibility
> EOF > EOF
#endif #endif
adding a adding a
adding b adding b
adding h adding h
$ hg mv a c $ hg mv a c
$ hg ci -Am 'i-1: a -move-> c' $ hg ci -Am 'i-1: a -move-> c'
$ hg mv c d $ hg mv c d
$ hg ci -Am 'i-2: c -move-> d' $ hg ci -Am 'i-2: c -move-> d'
$ hg log -G $ hg log -G
@ 2 i-2: c -move-> d @ i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
And having another branch with renames on the other side And having another branch with renames on the other side
$ hg mv d e $ hg mv d e
$ hg ci -Am 'a-1: d -move-> e' $ hg ci -Am 'a-1: d -move-> e'
$ hg mv e f $ hg mv e f
$ hg ci -Am 'a-2: e -move-> f' $ hg ci -Am 'a-2: e -move-> f'
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ 4 a-2: e -move-> f @ a-2: e -move-> f
| |
o 3 a-1: d -move-> e o a-1: d -move-> e
| |
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Have a branching with nothing on one side Have a branching with nothing on one side
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo foo > b $ echo foo > b
$ hg ci -m 'b-1: b update' $ hg ci -m 'b-1: b update'
created new head created new head
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ 5 b-1: b update @ b-1: b update
| |
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Create a branch that delete a file previous renamed Create a branch that delete a file previous renamed
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rm d $ hg rm d
$ hg ci -m 'c-1 delete d' $ hg ci -m 'c-1 delete d'
created new head created new head
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ 6 c-1 delete d @ c-1 delete d
| |
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Create a branch that delete a file previous renamed and recreate it Create a branch that delete a file previous renamed and recreate it
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rm d $ hg rm d
$ hg ci -m 'd-1 delete d' $ hg ci -m 'd-1 delete d'
created new head created new head
$ echo bar > d $ echo bar > d
$ hg add d $ hg add d
$ hg ci -m 'd-2 re-add d' $ hg ci -m 'd-2 re-add d'
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ 8 d-2 re-add d @ d-2 re-add d
| |
o 7 d-1 delete d o d-1 delete d
| |
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Having another branch renaming a different file to the same filename as another Having another branch renaming a different file to the same filename as another
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv b g $ hg mv b g
$ hg ci -m 'e-1 b -move-> g' $ hg ci -m 'e-1 b -move-> g'
created new head created new head
$ hg mv g f $ hg mv g f
$ hg ci -m 'e-2 g -move-> f' $ hg ci -m 'e-2 g -move-> f'
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ 10 e-2 g -move-> f @ e-2 g -move-> f
| |
o 9 e-1 b -move-> g o e-1 b -move-> g
| |
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Setup all merge Setup all merge
=============== ===============
This is done beforehand to validate that the upgrade process creates valid copy This is done beforehand to validate that the upgrade process creates valid copy
information. information.
$ hg up 'desc("a-2")' $ hg up 'desc("a-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mABm-0 $case_desc - the other way" $ hg ci -m "mABm-0 $case_desc - the other way"
created new head created new head
$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
@ 12 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
|\ |\
+---o 11 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way +---o mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
| |/ | |/
| o 5 b-1: b update | o b-1: b update
| | | |
o | 4 a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | 3 a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
merging with the side having a delete merging with the side having a delete
------------------------------------- -------------------------------------
case summary: case summary:
- one with change to an unrelated file - one with change to an unrelated file
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mCBm-0 $case_desc - the other way" $ hg ci -m "mCBm-0 $case_desc - the other way"
created new head created new head
$ echo bar > d $ echo bar > d
$ hg add d $ hg add d
$ hg ci -m 'mCBm-1 re-add d' $ hg ci -m 'mCBm-1 re-add d'
$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
@ 16 mCBm-1 re-add d @ mCBm-1 re-add d
| |
o 15 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way o mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
|\ |\
| | o 14 mBCm-1 re-add d | | o mBCm-1 re-add d
| | | | | |
+---o 13 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way +---o mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
| |/ | |/
| o 6 c-1 delete d | o c-1 delete d
| | | |
o | 5 b-1: b update o | b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Comparing with a merge re-adding the file afterward Comparing with a merge re-adding the file afterward
--------------------------------------------------- ---------------------------------------------------
Merge: Merge:
- one with change to an unrelated file - one with change to an unrelated file
- one deleting and recreating the change - one deleting and recreating the change
$ hg up 'desc("d-2")' $ hg up 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mDBm-0 $case_desc - the other way" $ hg ci -m "mDBm-0 $case_desc - the other way"
created new head created new head
$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
@ 18 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
|\ |\
+---o 17 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way +---o mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
| |/ | |/
| o 8 d-2 re-add d | o d-2 re-add d
| | | |
| o 7 d-1 delete d | o d-1 delete d
| | | |
o | 5 b-1: b update o | b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Comparing with a merge with colliding rename Comparing with a merge with colliding rename
-------------------------------------------- --------------------------------------------
Subcase: new copy information on both side Subcase: new copy information on both side
`````````````````````````````````````````` ``````````````````````````````````````````
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 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 @ 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 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 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 e-2 g -move-> f
| | | |
| o 9 e-1 b -move-> g | o e-1 b -move-> g
| | | |
o | 4 a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | 3 a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Subcase: existing copy information overwritten on one branch Subcase: existing copy information overwritten on one branch
```````````````````````````````````````````````````````````` ````````````````````````````````````````````````````````````
Merge: Merge:
- one with change to an unrelated file (b) - one with change to an unrelated file (b)
- one overwriting a file (d) with a rename (from h to i to d) - one overwriting a file (d) with a rename (from h to i to d)
$ hg up 'desc("f-2")' $ hg up 'desc("f-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")' $ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mFBm-0 $case_desc - the other way" $ hg ci -m "mFBm-0 $case_desc - the other way"
created new head created new head
$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
@ 24 mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way @ mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
|\ |\
+---o 23 mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way +---o mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
| |/ | |/
| o 22 f-2: rename i -> d | o f-2: rename i -> d
| | | |
| o 21 f-1: rename h -> i | o f-1: rename h -> i
| | | |
o | 5 b-1: b update o | b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Subcase: reset of the copy history on one side Subcase: reset of the copy history on one side
`````````````````````````````````````````````` ``````````````````````````````````````````````
Merge: Merge:
- one with change to a file - one with change to a file
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("d-2")' --tool :union $ hg merge 'desc("d-2")' --tool :union
merging d merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mGDm-0 $case_desc - the other way" $ hg ci -m "mGDm-0 $case_desc - the other way"
created new head created new head
$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
@ 27 mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way @ mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
|\ |\
+---o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way +---o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
| |/ | |/
| o 25 g-1: update d | o g-1: update d
| | | |
o | 8 d-2 re-add d o | d-2 re-add d
| | | |
o | 7 d-1 delete d o | d-1 delete d
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Subcase: merging a change to a file with a "copy overwrite" to that file from another branch Subcase: merging a change to a file with a "copy overwrite" to that file from another branch
```````````````````````````````````````````````````````````````````````````````````````````` ````````````````````````````````````````````````````````````````````````````````````````````
Merge: Merge:
- one with change to a file (d) - one with change to a file (d)
- one overwriting that file with a rename (from h to i, to d) - one overwriting that file with a rename (from h to i, to d)
$ hg merge 'desc("f-2")' --tool :union $ hg merge 'desc("f-2")' --tool :union
merging d (no-changeset !) merging d (no-changeset !)
0 files updated, 1 files merged, 1 files removed, 0 files unresolved (no-changeset !) 0 files updated, 1 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 "mGFm-0 $case_desc - the other way" $ hg ci -m "mGFm-0 $case_desc - the other way"
created new head created new head
$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
@ 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way @ mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
|\ |\
+---o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way +---o mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
| |/ | |/
| o 25 g-1: update d | o g-1: update d
| | | |
o | 22 f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | 21 f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Comparing with merging with a deletion (and keeping the file) Comparing with merging with a deletion (and keeping the file)
------------------------------------------------------------- -------------------------------------------------------------
Merge: Merge:
- one removing a file (d) - one removing a file (d)
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1] [1]
$ hg resolve -t :local d $ hg resolve -t :local d
(no more unresolved files) (no more unresolved files)
$ hg ci -m "mGCm-0 $case_desc - the other way" $ hg ci -m "mGCm-0 $case_desc - the other way"
created new head created new head
$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
@ 31 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way @ mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
|\ |\
+---o 30 mCGm-0 merge updated/deleted - revive the file (updated content) - one way +---o mCGm-0 merge updated/deleted - revive the file (updated content) - one way
| |/ | |/
| o 25 g-1: update d | o g-1: update d
| | | |
o | 6 c-1 delete d o | c-1 delete d
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Comparing with merge restoring an untouched deleted file Comparing with merge restoring an untouched deleted file
-------------------------------------------------------- --------------------------------------------------------
Merge: Merge:
$ hg merge 'desc("c-1")' $ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg revert --rev 'desc("b-1")' d $ hg revert --rev 'desc("b-1")' d
$ hg ci -m "mBC-revert-m-0 $case_desc - the other way" $ hg ci -m "mBC-revert-m-0 $case_desc - the other way"
created new head created new head
$ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
@ 33 mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way @ mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
|\ |\
+---o 32 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way +---o mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
| |/ | |/
| o 6 c-1 delete d | o c-1 delete d
| | | |
o | 5 b-1: b update o | b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
$ hg up null --quiet $ hg up null --quiet
Merging a branch where a rename was deleted with a branch where the same file was renamed Merging a branch where a rename was deleted with a branch where the same file was renamed
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
$ hg up 'desc("h-1")' $ hg up 'desc("h-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("c-1")' $ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mHC-delete-before-conflict-m-0 $case_desc - the other way" $ hg ci -m "mHC-delete-before-conflict-m-0 $case_desc - the other way"
created new head created new head
$ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
@ 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 @ 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
|\ |\
+---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 +---o 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
| |/ | |/
| o 34 h-1: b -(move)-> d | o h-1: b -(move)-> d
| | | |
o | 6 c-1 delete d o | c-1 delete d
| | | |
o | 2 i-2: c -move-> d o | i-2: c -move-> d
| | | |
o | 1 i-1: a -move-> c o | i-1: a -move-> c
|/ |/
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Decision from previous merge are properly chained with later merge Decision from previous merge are properly chained with later merge
------------------------------------------------------------------ ------------------------------------------------------------------
Subcase: chaining conflicting rename resolution Subcase: chaining conflicting rename resolution
``````````````````````````````````````````````` ```````````````````````````````````````````````
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 "mJ,EAm: $case_desc" $ hg ci -m "mJ,EAm: $case_desc"
created new head created new head
$ hg log -G --rev '::(desc("mAE,Km") + desc("mK,AEm") + desc("mEA,Jm") + desc("mJ,EAm"))' $ hg log -G --rev '::(desc("mAE,Km") + desc("mK,AEm") + desc("mEA,Jm") + desc("mJ,EAm"))'
@ 42 mJ,EAm: chained merges (conflict -> simple) - same content everywhere @ mJ,EAm: chained merges (conflict -> simple) - same content everywhere
|\ |\
+---o 41 mEA,Jm: chained merges (conflict -> simple) - same content everywhere +---o mEA,Jm: chained merges (conflict -> simple) - same content everywhere
| |/ | |/
| | o 40 mK,AEm: chained merges (conflict -> simple) - same content everywhere | | o mK,AEm: chained merges (conflict -> simple) - same content everywhere
| | |\ | | |\
| | +---o 39 mAE,Km: chained merges (conflict -> simple) - same content everywhere | | +---o mAE,Km: chained merges (conflict -> simple) - same content everywhere
| | | |/ | | | |/
| | | o 38 k-1: unrelated changes (based on "e" changes) | | | o k-1: unrelated changes (based on "e" changes)
| | | | | | | |
| o | | 37 j-1: unrelated changes (based on the "a" series of changes) | o | | j-1: unrelated changes (based on the "a" series of changes)
| | | | | | | |
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-----+ 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 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 / 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 e-2 g -move-> f
| | | |
| o 9 e-1 b -move-> g | o e-1 b -move-> g
| | | |
o | 4 a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | 3 a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Subcase: chaining salvage information during a merge Subcase: chaining salvage information during a merge
```````````````````````````````````````````````````` ````````````````````````````````````````````````````
We add more change on the branch were the file was deleted. merging again We add more change on the branch were the file was deleted. merging again
should preserve the fact eh file was salvaged. should preserve the fact eh file was salvaged.
$ hg merge 'desc("mCB-revert-m")' $ hg merge 'desc("mCB-revert-m")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mL,CB+revertm: $case_desc" $ hg ci -m "mL,CB+revertm: $case_desc"
created new head created new head
$ hg log -G --rev '::(desc("mBC+revert,Lm") + desc("mCB+revert,Lm") + desc("mL,BC+revertm") + desc("mL,CB+revertm"))' $ hg log -G --rev '::(desc("mBC+revert,Lm") + desc("mCB+revert,Lm") + desc("mL,BC+revertm") + desc("mL,CB+revertm"))'
@ 47 mL,CB+revertm: chained merges (salvaged -> simple) - same content (when the file exists) @ mL,CB+revertm: chained merges (salvaged -> simple) - same content (when the file exists)
|\ |\
| | o 46 mL,BC+revertm: chained merges (salvaged -> simple) - same content (when the file exists) | | o mL,BC+revertm: chained merges (salvaged -> simple) - same content (when the file exists)
| |/| | |/|
+-+---o 45 mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) +-+---o mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
| | | | | |
| +---o 44 mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) | +---o mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
| | |/ | | |/
| o | 43 l-1: unrelated changes (based on "c" changes) | o | l-1: unrelated changes (based on "c" changes)
| | | | | |
| | o 33 mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way | | o mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
| |/| | |/|
o---+ 32 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way o---+ mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
|/ / |/ /
o | 6 c-1 delete d o | c-1 delete d
| | | |
| o 5 b-1: b update | o b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Subcase: chaining "merged" information during a merge Subcase: chaining "merged" information during a merge
`````````````````````````````````````````````````````` ``````````````````````````````````````````````````````
When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges. When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges.
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("mGFm")' $ hg merge 'desc("mGFm")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "mN,GFm: $case_desc" $ hg ci -m "mN,GFm: $case_desc"
created new head created new head
$ hg log -G --rev '::(desc("mFG,Om") + desc("mO,FGm") + desc("mGF,Nm") + desc("mN,GFm"))' $ hg log -G --rev '::(desc("mFG,Om") + desc("mO,FGm") + desc("mGF,Nm") + desc("mN,GFm"))'
@ 53 mN,GFm: chained merges (copy-overwrite -> simple) - same content @ mN,GFm: chained merges (copy-overwrite -> simple) - same content
|\ |\
+---o 52 mGF,Nm: chained merges (copy-overwrite -> simple) - same content +---o mGF,Nm: chained merges (copy-overwrite -> simple) - same content
| |/ | |/
| | o 51 mO,FGm: chained merges (copy-overwrite -> simple) - same content | | o mO,FGm: chained merges (copy-overwrite -> simple) - same content
| | |\ | | |\
| | +---o 50 mFG,Om: chained merges (copy-overwrite -> simple) - same content | | +---o mFG,Om: chained merges (copy-overwrite -> simple) - same content
| | | |/ | | | |/
| | | o 49 o-1: unrelated changes (based on "g" changes) | | | o o-1: unrelated changes (based on "g" changes)
| | | | | | | |
| o | | 48 n-1: unrelated changes (based on the "f" series of changes) | o | | n-1: unrelated changes (based on the "f" series of changes)
| | | | | | | |
o-----+ 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way o-----+ mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
|/ / / |/ / /
| o / 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way | o / mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
|/|/ |/|/
| o 25 g-1: update d | o g-1: update d
| | | |
o | 22 f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | 21 f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Summary of all created cases Summary of all created cases
---------------------------- ----------------------------
$ hg up --quiet null $ hg up --quiet null
(This exists to help keeping a compact list of the various cases we have built) (This exists to help keeping a compact list of the various cases we have built)
mAE,Km: chained merges (conflict -> simple) - same content everywhere mAE,Km: chained merges (conflict -> simple) - same content everywhere
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 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,Lm: chained merges (salvaged -> simple) - same content (when the file exists) mBC+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
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 - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists) mCB+revert,Lm: chained merges (salvaged -> simple) - same content (when the file exists)
mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
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 merge updated/deleted - revive the file (updated content) - one way mCGm-0 merge updated/deleted - revive the file (updated content) - one way
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 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
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
merging with unrelated change does not interfere with the renames merging with unrelated change does not interfere with the renames
--------------------------------------------------------------- ---------------------------------------------------------------
- rename on one side - rename on one side
- unrelated change on the other side - unrelated change on the other side
$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
o 12 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way o mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
|\ |\
+---o 11 mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way +---o mBAm-0 simple merge - A side: multiple renames, B side: unrelated update - one way
| |/ | |/
| o 5 b-1: b update | o b-1: b update
| | | |
o | 4 a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | 3 a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")'
A f A f
d d
R d R d
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBAm")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBAm")'
A f A f
------------------------------------- -------------------------------------
case summary: case summary:
- one with change to an unrelated file - one with change to an unrelated file
- one deleting the change - one deleting the change
and recreate an unrelated file after the merge and recreate an unrelated file after the merge
$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))' $ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
o 16 mCBm-1 re-add d o mCBm-1 re-add d
| |
o 15 mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way o mCBm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - the other way
|\ |\
| | o 14 mBCm-1 re-add d | | o mBCm-1 re-add d
| | | | | |
+---o 13 mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way +---o mBCm-0 simple merge - C side: delete a file with copies history , B side: unrelated update - one way
| |/ | |/
| o 6 c-1 delete d | o c-1 delete d
| | | |
o | 5 b-1: b update o | b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
- comparing from the merge - comparing from the merge
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-0")'
R d R d
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mCBm-0")'
R d R d
$ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-0")' $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBCm-0")'
Comparing with a merge re-adding the file afterward Comparing with a merge re-adding the file afterward
--------------------------------------------------- ---------------------------------------------------
Merge: Merge:
- one with change to an unrelated file - one with change to an unrelated file
- one deleting and recreating the change - one deleting and recreating the change
$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
o 18 mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way o mDBm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - the other way
|\ |\
+---o 17 mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way +---o mBDm-0 simple merge - B side: unrelated update, D side: delete and recreate a file (with different content) - one way
| |/ | |/
| o 8 d-2 re-add d | o d-2 re-add d
| | | |
| o 7 d-1 delete d | o d-1 delete d
| | | |
o | 5 b-1: b update o | b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")'
M d M d
$ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mDBm-0")'
M d M d
$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mBDm-0")'
M b M b
$ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDBm-0")'
0 2 56647659eff0 000000000000 000000000000 (changeset !) 0 2 56647659eff0 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000 1 8 b004912a8510 000000000000 000000000000
2 22 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !) 2 22 6cbc9c2b7b39 000000000000 000000000000 (no-changeset !)
2 25 b894de5c94aa 56647659eff0 000000000000 (changeset !) 2 25 b894de5c94aa 56647659eff0 000000000000 (changeset !)
Log output should not include a merge commit as it did not happen Log output should not include a merge commit as it did not happen
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o 8 d-2 re-add d o d-2 re-add d
| |
~ ~
$ hg log -Gfr 'desc("mDBm-0")' d $ hg log -Gfr 'desc("mDBm-0")' d
o 8 d-2 re-add d o d-2 re-add d
| |
~ ~
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")'
M b M b
A d A d
R a R a
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")'
M b M b
A d A d
R a R a
Comparing with a merge with colliding rename Comparing with a merge with colliding rename
-------------------------------------------- --------------------------------------------
Subcase: new copy information on both side Subcase: new copy information on both side
`````````````````````````````````````````` ``````````````````````````````````````````
- 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 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 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 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 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 e-2 g -move-> f
| | | |
| o 9 e-1 b -move-> g | o e-1 b -move-> g
| | | |
o | 4 a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | 3 a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
#if no-changeset #if no-changeset
$ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
ffb76cd765422a18759a335d8a81fa2bd455be6b 644 f ffb76cd765422a18759a335d8a81fa2bd455be6b 644 f
$ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f'
ffb76cd765422a18759a335d8a81fa2bd455be6b 644 f ffb76cd765422a18759a335d8a81fa2bd455be6b 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
cedeacc5bf5d9b9be4d7f8394d33a5349bb29c6e 644 f cedeacc5bf5d9b9be4d7f8394d33a5349bb29c6e 644 f
| This lead to bad copy tracing information to be dug up. | This lead to bad copy tracing information to be dug up.
Merge: Merge:
- one with change to an unrelated file (b) - one with change to an unrelated file (b)
- one overwriting a file (d) with a rename (from h to i to d) - one overwriting a file (d) with a rename (from h to i to d)
$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))' $ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
o 24 mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way o mFBm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - the other way
|\ |\
+---o 23 mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way +---o mBFm-0 simple merge - B side: unrelated change, F side: overwrite d with a copy (from h->i->d) - one way
| |/ | |/
| o 22 f-2: rename i -> d | o f-2: rename i -> d
| | | |
| o 21 f-1: rename h -> i | o f-1: rename h -> i
| | | |
o | 5 b-1: b update o | b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
M b M b
A d A d
h h
R a R a
R h R h
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
$ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")' $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFBm-0")'
M b M b
M d (no-changeset !) M d (no-changeset !)
i (no-filelog no-changeset !) i (no-filelog no-changeset !)
R i R i
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mBFm-0")' d $ hg log -Gfr 'desc("mBFm-0")' d
o 22 f-2: rename i -> d o f-2: rename i -> d
| |
o 21 f-1: rename h -> i o f-1: rename h -> i
: :
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mBFm-0")' d $ hg log -Gfr 'desc("mBFm-0")' d
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
~ ~
#endif #endif
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mFBm-0")' d $ hg log -Gfr 'desc("mFBm-0")' d
o 22 f-2: rename i -> d o f-2: rename i -> d
| |
o 21 f-1: rename h -> i o f-1: rename h -> i
: :
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mFBm-0")' d $ hg log -Gfr 'desc("mFBm-0")' d
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
~ ~
#endif #endif
Subcase: reset of the copy history on one side Subcase: reset of the copy history on one side
`````````````````````````````````````````````` ``````````````````````````````````````````````
Merge: Merge:
- one with change to a file - one with change to a file
- one deleting and recreating the file - one deleting and recreating the file
Unlike in the 'BD/DB' cases, an actual merge happened here. So we should Unlike in the 'BD/DB' cases, an actual merge happened here. So we should
consider history and rename on both branch of the merge. consider history and rename on both branch of the merge.
$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))' $ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
o 27 mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way o mGDm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - the other way
|\ |\
+---o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way +---o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
| |/ | |/
| o 25 g-1: update d | o g-1: update d
| | | |
o | 8 d-2 re-add d o | d-2 re-add d
| | | |
o | 7 d-1 delete d o | d-1 delete d
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
One side of the merge have a long history with rename. The other side of the One side of the merge have a long history with rename. The other side of the
merge point to a new file with a smaller history. Each side is "valid". merge point to a new file with a smaller history. Each side is "valid".
(and again the filelog based algorithm only explore one, with a pick based on (and again the filelog based algorithm only explore one, with a pick based on
revision numbers) revision numbers)
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")'
M d M d
$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mDGm-0")' $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mDGm-0")'
M d M d
$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGDm-0")' $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGDm-0")'
M d M d
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
|\ |\
| o 25 g-1: update d | o g-1: update d
| | | |
o | 8 d-2 re-add d o | d-2 re-add d
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
|\ |\
| o 25 g-1: update d | o g-1: update d
| | | |
o | 8 d-2 re-add d o | d-2 re-add d
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
~ ~
#endif #endif
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
|\ |\
| o 25 g-1: update d | o g-1: update d
| | | |
o | 8 d-2 re-add d o | d-2 re-add d
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way o mDGm-0 actual content merge, copies on one side - D side: delete and re-add (different content), G side: update content - one way
|\ |\
| o 25 g-1: update d | o g-1: update d
| | | |
o | 8 d-2 re-add d o | d-2 re-add d
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
~ ~
#endif #endif
Subcase: merging a change to a file with a "copy overwrite" to that file from another branch Subcase: merging a change to a file with a "copy overwrite" to that file from another branch
```````````````````````````````````````````````````````````````````````````````````````````` ````````````````````````````````````````````````````````````````````````````````````````````
Merge: Merge:
- one with change to a file (d) - one with change to a file (d)
- one overwriting that file with a rename (from h to i, to d) - one overwriting that file with a rename (from h to i, to d)
This case is similar to BF/FB, but an actual merge happens, so both side of the This case is similar to BF/FB, but an actual merge happens, so both side of the
history are relevant. history are relevant.
$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))' $ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
o 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way o mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
|\ |\
+---o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way +---o mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
| |/ | |/
| o 25 g-1: update d | o g-1: update d
| | | |
o | 22 f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | 21 f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
Note: Note:
| In this case, the merge get conflicting information since on one side we have | In this case, the merge get conflicting information since on one side we have
| "a -> c -> d". and one the other one we have "h -> i -> d". | "a -> c -> d". and one the other one we have "h -> i -> d".
| |
| The current code arbitrarily pick one side depending the ordering of the merged hash: | The current code arbitrarily pick one side depending the ordering of the merged hash:
R h R h
$ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGFm-0")' $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mGFm-0")'
M d (no-changeset !) M d (no-changeset !)
h (no-filelog no-changeset !) h (no-filelog no-changeset !)
R h R h
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mFGm-0")' d $ hg log -Gfr 'desc("mFGm-0")' d
o 28 mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way o mFGm-0 merge - G side: content change, F side: copy overwrite, no content change - one way
|\ |\
| o 25 g-1: update d | o g-1: update d
| | | |
o | 22 f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | 21 f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mFGm-0")' d $ hg log -Gfr 'desc("mFGm-0")' d
o 25 g-1: update d o g-1: update d
| |
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
~ ~
#endif #endif
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mGFm-0")' d $ hg log -Gfr 'desc("mGFm-0")' d
o 29 mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way o mGFm-0 merge - G side: content change, F side: copy overwrite, no content change - the other way
|\ |\
| o 25 g-1: update d | o g-1: update d
| | | |
o | 22 f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | 21 f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
#else #else
BROKEN: `hg log --follow <file>` relies on filelog metadata to work BROKEN: `hg log --follow <file>` relies on filelog metadata to work
$ hg log -Gfr 'desc("mGFm-0")' d $ hg log -Gfr 'desc("mGFm-0")' d
o 25 g-1: update d o g-1: update d
| |
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
~ ~
#endif #endif
Comparing with merging with a deletion (and keeping the file) Comparing with merging with a deletion (and keeping the file)
------------------------------------------------------------- -------------------------------------------------------------
Merge: Merge:
- one removing a file (d) - one removing a file (d)
- one updating that file - one updating that file
- the merge keep the modified version of the file (canceling the delete) - the merge keep the modified version of the file (canceling the delete)
In this case, the file keep on living after the merge. So we should not drop its In this case, the file keep on living after the merge. So we should not drop its
copy tracing chain. copy tracing chain.
$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
o 31 mGCm-0 merge updated/deleted - revive the file (updated content) - the other way o mGCm-0 merge updated/deleted - revive the file (updated content) - the other way
|\ |\
+---o 30 mCGm-0 merge updated/deleted - revive the file (updated content) - one way +---o mCGm-0 merge updated/deleted - revive the file (updated content) - one way
| |/ | |/
| o 25 g-1: update d | o g-1: update d
| | | |
o | 6 c-1 delete d o | c-1 delete d
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
'a' is the copy source of 'd' 'a' is the copy source of 'd'
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")'
A d A d
a (no-compatibility no-changeset !) a (no-compatibility no-changeset !)
R a R a
- one removing a file (d) - one removing a file (d)
- one leaving the file untouched - one leaving the file untouched
- the merge actively restore the file to the same content. - the merge actively restore the file to the same content.
In this case, the file keep on living after the merge. So we should not drop its In this case, the file keep on living after the merge. So we should not drop its
copy tracing chain. copy tracing chain.
$ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))' $ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
o 33 mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way o mBC-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - the other way
|\ |\
+---o 32 mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way +---o mCB-revert-m-0 merge explicitely revive deleted file - B side: unrelated change, C side: delete d (restored by merge) - one way
| |/ | |/
| o 6 c-1 delete d | o c-1 delete d
| | | |
o | 5 b-1: b update o | b-1: b update
|/ |/
o 2 i-2: c -move-> d o i-2: c -move-> d
| |
o 1 i-1: a -move-> c o i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
'a' is the the copy source of 'd' 'a' is the the copy source of 'd'
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")'
M b M b
A d A d
a (no-compatibility no-changeset !) a (no-compatibility no-changeset !)
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
Create a "conflicting" merge where `d` get removed on one branch before its Create a "conflicting" merge where `d` get removed on one branch before its
rename information actually conflict with the other branch. rename information actually conflict with the other branch.
(the copy information from the branch that was not deleted should win). (the copy information from the branch that was not deleted should win).
$ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))' $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
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 o 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
|\ |\
+---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 +---o 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
| |/ | |/
| o 34 h-1: b -(move)-> d | o h-1: b -(move)-> d
| | | |
o | 6 c-1 delete d o | c-1 delete d
| | | |
o | 2 i-2: c -move-> d o | i-2: c -move-> d
| | | |
o | 1 i-1: a -move-> c o | i-1: a -move-> c
|/ |/
o 0 i-0 initial commit: a b h o i-0 initial commit: a b h
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")'
A d A d
b (no-compatibility no-changeset !) b (no-compatibility no-changeset !)
R a R a
R b R b
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")'