This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8258

copies-tests: remove spurious `]` in the template
ClosedPublic

Authored by marmoute on Mar 6 2020, 6:52 PM.

Details

Reviewers
Alphare
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG25d97090c6ca: copies-tests: remove spurious `]` in the template
Summary

Fixing this typo happily impact all the tests output.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Mar 6 2020, 6:52 PM

series update after Martin feedback

Alphare accepted this revision.Mar 13 2020, 12:08 PM
martinvonz accepted this revision.Apr 2 2020, 4:31 PM
martinvonz added a subscriber: martinvonz.

This one is trivial to move ahead of the other two patches so I'll queue it and fix any conflicts in flight.

This revision is now accepted and ready to land.Apr 2 2020, 4:31 PM
marmoute added a commit: rHG25d97090c6ca: copies-tests: remove spurious `]` in the template.Apr 2 2020, 4:34 PM
Closed by commit rHG25d97090c6ca: copies-tests: remove spurious `]` in the template (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute added a comment.Apr 3 2020, 4:33 PM
In D8258#124952, @martinvonz wrote:

This one is trivial to move ahead of the other two patches so I'll queue it and fix any conflicts in flight.

Please do not queue this now. It is explicitly after the other so that we don't mix this (cosmetic) test change with the actual semantic test change.

Revision Contents
Changeset List

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

Diff 20597

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
> [ui] > [ui]
> logtemplate={rev} {desc}]\n > logtemplate={rev} {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] @ 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 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] @ 4 a-2: e -move-> f
| |
o 3 a-1: d -move-> e] o 3 a-1: d -move-> e
| |
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 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] @ 5 b-1: b update
| |
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
Merge the two branches we just defined (in both directions) Merge the two branches we just defined (in both directions)
- one with change to an unrelated file - one with change to an unrelated file
- one with renames in them - one with renames in them
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("a-2")' $ hg merge 'desc("a-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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mBAm-0 simple merge - one way' $ hg ci -m 'mBAm-0 simple merge - one way'
$ 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 simple merge - the other way' $ hg ci -m 'mABm-0 simple merge - 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"))'
@ 7 mABm-0 simple merge - the other way] @ 7 mABm-0 simple merge - the other way
|\ |\
+---o 6 mBAm-0 simple merge - one way] +---o 6 mBAm-0 simple merge - one way
| |/ | |/
| o 5 b-1: b update] | o 5 b-1: b update
| | | |
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
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 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")'
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 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 '::.'
@ 8 c-1 delete d] @ 8 c-1 delete d
| |
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
Merge: Merge:
- 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 up 'desc("b-1")' $ hg up '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 'mCBm-0 simple merge - the other way' $ hg ci -m 'mCBm-0 simple merge - 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"))'
@ 12 mCBm-1 re-add d] @ 12 mCBm-1 re-add d
| |
o 11 mCBm-0 simple merge - the other way] o 11 mCBm-0 simple merge - the other way
|\ |\
| | o 10 mBCm-1 re-add d] | | o 10 mBCm-1 re-add d
| | | | | |
+---o 9 mBCm-0 simple merge - one way] +---o 9 mBCm-0 simple merge - one way
| |/ | |/
| o 8 c-1 delete d] | o 8 c-1 delete d
| | | |
o | 5 b-1: b update] o | 5 b-1: b update
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 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")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 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 '::.'
@ 14 d-2 re-add d] @ 14 d-2 re-add d
| |
o 13 d-1 delete d] o 13 d-1 delete d
| |
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
Merge: Merge:
- one with change to an unrelated file - one with change to an unrelated file
- one deleting and recreating the file - one deleting and recreating the file
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
$ 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 simple merge - the other way' $ hg ci -m 'mDBm-0 simple merge - 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"))'
@ 16 mDBm-0 simple merge - the other way] @ 16 mDBm-0 simple merge - the other way
|\ |\
+---o 15 mBDm-0 simple merge - one way] +---o 15 mBDm-0 simple merge - one way
| |/ | |/
| o 14 d-2 re-add d] | o 14 d-2 re-add d
| | | |
| o 13 d-1 delete d] | o 13 d-1 delete d
| | | |
o | 5 b-1: b update] o | 5 b-1: b update
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 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")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 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 '::.'
@ 18 e-2 g -move-> f] @ 18 e-2 g -move-> f
| |
o 17 e-1 b -move-> g] o 17 e-1 b -move-> g
| |
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
Merge: Merge:
- 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 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 1 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 'mAEm-0 simple merge - one way' $ hg ci -m 'mAEm-0 simple merge - one way'
$ hg up 'desc("e-2")' $ hg up 'desc("e-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("a-2")' $ hg merge 'desc("a-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
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m 'mEAm-0 simple merge - the other way' $ hg ci -m 'mEAm-0 simple merge - 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 simple merge - the other way
|\ |\
+---o 19 mAEm-0 simple merge - one way] +---o 19 mAEm-0 simple merge - one way
| |/ | |/
| o 18 e-2 g -move-> f] | o 18 e-2 g -move-> f
| | | |
| o 17 e-1 b -move-> g] | o 17 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
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
Note: Note:
| In this case, one of the merge wrongly record a merge while there is none. | In this case, one of the merge wrongly record a merge while there is none.
| This lead to bad copy tracing information to be dug up. | This lead to bad copy tracing information to be dug up.
Merge: Merge:
$ 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 simple merge - the other way' $ hg ci -m 'mFBm-0 simple merge - 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 - the other way] @ 24 mFBm-0 simple merge - the other way
|\ |\
+---o 23 mBFm-0 simple merge - one way] +---o 23 mBFm-0 simple merge - one way
| |/ | |/
| o 22 f-2: rename i -> d] | o 22 f-2: rename i -> d
| | | |
| o 21 f-1: rename h -> i] | o 21 f-1: rename h -> i
| | | |
o | 5 b-1: b update] o | 5 b-1: b update
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
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
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
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 simple merge - the other way' $ hg ci -m 'mGDm-0 simple merge - 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 simple merge - the other way] @ 27 mGDm-0 simple merge - the other way
|\ |\
+---o 26 mDGm-0 simple merge - one way] +---o 26 mDGm-0 simple merge - one way
| |/ | |/
| o 25 g-1: update d] | o 25 g-1: update d
| | | |
o | 14 d-2 re-add d] o | 14 d-2 re-add d
| | | |
o | 13 d-1 delete d] o | 13 d-1 delete d
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
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 up 'desc("f-2")' $ hg up 'desc("f-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
$ hg merge 'desc("g-1")' --tool :union $ hg merge 'desc("g-1")' --tool :union
merging d merging d
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 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 'mFGm-0 simple merge - one way' $ hg ci -m 'mFGm-0 simple merge - one way'
created new head created new head
$ hg up 'desc("g-1")' $ hg up 'desc("g-1")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")' --tool :union $ hg merge 'desc("f-2")' --tool :union
merging d merging d
0 files updated, 1 files merged, 1 files removed, 0 files unresolved 0 files updated, 1 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 'mGFm-0 simple merge - the other way' $ hg ci -m 'mGFm-0 simple merge - 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 simple merge - the other way] @ 29 mGFm-0 simple merge - the other way
|\ |\
+---o 28 mFGm-0 simple merge - one way] +---o 28 mFGm-0 simple merge - one way
| |/ | |/
| o 25 g-1: update d] | o 25 g-1: update d
| | | |
o | 22 f-2: rename i -> d] o | 22 f-2: rename i -> d
| | | |
o | 21 f-1: rename h -> i] o | 21 f-1: rename h -> i
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
Check results Check results
============= =============
merging with unrelated change does not interfer wit the renames merging with unrelated change does not interfer wit the renames
--------------------------------------------------------------- ---------------------------------------------------------------
1 10 b004912a8510 000000000000 000000000000 1 10 b004912a8510 000000000000 000000000000
2 22 c72365ee036f 000000000000 000000000000 2 22 c72365ee036f 000000000000 000000000000
3 25 7bded9d9da1f 01c2f5eabdc4 000000000000 3 25 7bded9d9da1f 01c2f5eabdc4 000000000000
4 26 f04cac32d703 b004912a8510 7bded9d9da1f 4 26 f04cac32d703 b004912a8510 7bded9d9da1f
5 27 d7a5eafb9322 7bded9d9da1f b004912a8510 5 27 d7a5eafb9322 7bded9d9da1f b004912a8510
6 28 2ed7a51aed47 c72365ee036f 7bded9d9da1f 6 28 2ed7a51aed47 c72365ee036f 7bded9d9da1f
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o 14 d-2 re-add d] o 14 d-2 re-add d
| |
~ ~
$ hg log -Gfr 'desc("mDBm-0")' d $ hg log -Gfr 'desc("mDBm-0")' d
o 14 d-2 re-add d] o 14 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
M d M d
i (no-filelog !) i (no-filelog !)
R i R i
The following graphlog is wrong, the "a -> c -> d" chain was overwritten and should not appear. The following graphlog is wrong, the "a -> c -> d" chain was overwritten and should not appear.
$ hg log -Gfr 'desc("mBFm-0")' d $ hg log -Gfr 'desc("mBFm-0")' d
o 22 f-2: rename i -> d] o 22 f-2: rename i -> d
| |
o 21 f-1: rename h -> i] o 21 f-1: rename h -> i
: :
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
The following output is correct. The following output is correct.
$ hg log -Gfr 'desc("mFBm-0")' d $ hg log -Gfr 'desc("mFBm-0")' d
o 22 f-2: rename i -> d] o 22 f-2: rename i -> d
| |
o 21 f-1: rename h -> i] o 21 f-1: rename h -> i
: :
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
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 actuall merge happened here. So we should Unlike in the 'BD/DB' cases, an actuall 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 status --copies --rev 'desc("d-2")' --rev 'desc("mGDm-0")' $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mGDm-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
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way] o 26 mDGm-0 simple merge - one way
|\ |\
| o 25 g-1: update d] | o 25 g-1: update d
| | | |
o | 14 d-2 re-add d] o | 14 d-2 re-add d
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
$ hg log -Gfr 'desc("mDGm-0")' d $ hg log -Gfr 'desc("mDGm-0")' d
o 26 mDGm-0 simple merge - one way] o 26 mDGm-0 simple merge - one way
|\ |\
| o 25 g-1: update d] | o 25 g-1: update d
| | | |
o | 14 d-2 re-add d] o | 14 d-2 re-add d
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
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
h (no-filelog !) h (no-filelog !)
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 M d
h (no-filelog !) h (no-filelog !)
R h R h
$ hg log -Gfr 'desc("mFGm-0")' d $ hg log -Gfr 'desc("mFGm-0")' d
o 28 mFGm-0 simple merge - one way] o 28 mFGm-0 simple merge - one way
|\ |\
| o 25 g-1: update d] | o 25 g-1: update d
| | | |
o | 22 f-2: rename i -> d] o | 22 f-2: rename i -> d
| | | |
o | 21 f-1: rename h -> i] o | 21 f-1: rename h -> i
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h
$ hg log -Gfr 'desc("mGFm-0")' d $ hg log -Gfr 'desc("mGFm-0")' d
@ 29 mGFm-0 simple merge - the other way] @ 29 mGFm-0 simple merge - the other way
|\ |\
| o 25 g-1: update d] | o 25 g-1: update d
| | | |
o | 22 f-2: rename i -> d] o | 22 f-2: rename i -> d
| | | |
o | 21 f-1: rename h -> i] o | 21 f-1: rename h -> i
|/ |/
o 2 i-2: c -move-> d] o 2 i-2: c -move-> d
| |
o 1 i-1: a -move-> c] o 1 i-1: a -move-> c
| |
o 0 i-0 initial commit: a b h] o 0 i-0 initial commit: a b h