This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8239

copies-tests: add a `h` to the root commit (for chain merge tests)
ClosedPublic

Authored by marmoute on Mar 5 2020, 1:14 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG902b559202a6: copies-tests: add a `h` to the root commit (for chain merge tests)
Summary

This will be useful for incoming new test cases. We need a new file to rename
around.

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.Mar 5 2020, 1:14 PM
marmoute updated this revision to Diff 20546.Mar 6 2020, 5:21 AM
martinvonz added a subscriber: martinvonz.Mar 6 2020, 1:14 PM
martinvonz added inline comments.
tests/test-copies-chain-merge.t
26–27

also update the commit message

marmoute marked an inline comment as done.Mar 6 2020, 5:51 PM
marmoute added a commit: rHG902b559202a6: copies-tests: add a `h` to the root commit (for chain merge tests).Mar 6 2020, 7:30 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG902b559202a6: copies-tests: add a `h` to the root commit (for chain merge tests) (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 (27 lines)

Diff 20602

tests/test-copies-chain-merge.t

> logtemplate={rev} {desc}]\n > logtemplate={rev} {desc}]\n
> EOF > EOF
$ hg init repo-chain $ hg init repo-chain
$ cd repo-chain $ cd repo-chain
Add some linear rename initialy Add some linear rename initialy
$ touch a b $ touch a b h
$ hg ci -Am 'i-0 initial commit: a b' $ hg ci -Am 'i-0 initial commit: a b h'
martinvonzUnsubmitted
Done

also update the commit message

martinvonz: also update the commit message
adding a adding a
adding b adding b
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] 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] 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] 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")'
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] 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] 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")'
| 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] 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] 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
| 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] 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] 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
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] 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.
Check results Check results
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 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] o 0 i-0 initial commit: a b h]
This `hg log` output is correct This `hg log` output is correct
$ 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]
| |
~ ~