This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10065

tests: correct a commit description in test-copies-chain-merge.t
ClosedPublic

Authored by martinvonz on Feb 24 2021, 12:32 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd7d64b8c8229: tests: correct a commit description in test-copies-chain-merge.t

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

martinvonz created this revision.Feb 24 2021, 12:32 PM
pulkit accepted this revision.Feb 27 2021, 12:19 PM
This revision is now accepted and ready to land.Feb 27 2021, 12:19 PM

Revision Contents
Changeset List

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

Diff 25980

tests/test-copies-chain-merge.t

Add some linear rename initialy Add some linear rename initialy
$ cp ../same-content.txt a $ cp ../same-content.txt a
$ cp ../same-content.txt b $ cp ../same-content.txt b
$ cp ../same-content.txt h $ cp ../same-content.txt h
$ echo "original content for P" > p $ echo "original content for P" > p
$ echo "original content for Q" > q $ echo "original content for Q" > q
$ echo "original content for R" > r $ echo "original content for R" > r
$ hg ci -Am 'i-0 initial commit: a b h' $ hg ci -Am 'i-0 initial commit: a b h p q r'
adding a adding a
adding b adding b
adding h adding h
adding p adding p
adding q adding q
adding r adding r
$ hg mv a c $ hg mv a c
$ hg mv p s $ hg mv p s
$ hg ci -Am 'i-1: a -move-> c, p -move-> s' $ hg ci -Am 'i-1: a -move-> c, p -move-> s'
$ hg mv c d $ hg mv c d
$ hg mv s t $ hg mv s t
$ hg ci -Am 'i-2: c -move-> d, s -move-> t' $ hg ci -Am 'i-2: c -move-> d, s -move-> t'
$ hg log -G $ hg log -G
@ i-2: c -move-> d, s -move-> t @ i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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 '::.'
@ a-2: e -move-> f @ a-2: e -move-> f
| |
o a-1: d -move-> e o a-1: d -move-> e
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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 '::.'
@ b-1: b update @ b-1: b update
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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 '::.'
@ c-1 delete d @ c-1 delete d
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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 '::.'
@ d-2 re-add d @ d-2 re-add d
| |
o d-1 delete d o d-1 delete d
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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 '::.'
@ e-2 g -move-> f @ e-2 g -move-> f
| |
o e-1 b -move-> g o e-1 b -move-> g
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ hg up -q null $ hg up -q null
Having a branch similar to the 'a' one, but moving the 'p' file around. Having a branch similar to the 'a' one, but moving the 'p' file around.
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
6 files updated, 0 files merged, 0 files removed, 0 files unresolved 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv t u $ hg mv t u
$ hg ci -Am 'p-1: t -move-> u' $ hg ci -Am 'p-1: t -move-> u'
created new head created new head
$ hg mv u v $ hg mv u v
$ hg ci -Am 'p-2: u -move-> v' $ hg ci -Am 'p-2: u -move-> v'
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ p-2: u -move-> v @ p-2: u -move-> v
| |
o p-1: t -move-> u o p-1: t -move-> u
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ hg up -q null $ hg up -q null
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")'
6 files updated, 0 files merged, 0 files removed, 0 files unresolved 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv r w $ hg mv r w
$ hg ci -m 'q-1 r -move-> w' $ hg ci -m 'q-1 r -move-> w'
created new head created new head
$ hg mv w v $ hg mv w v
$ hg ci -m 'q-2 w -move-> v' $ hg ci -m 'q-2 w -move-> v'
$ hg log -G --rev '::.' $ hg log -G --rev '::.'
@ q-2 w -move-> v @ q-2 w -move-> v
| |
o q-1 r -move-> w o q-1 r -move-> w
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ hg up -q null $ hg up -q null
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.
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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
| o c-1 delete d | o c-1 delete d
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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
| o d-1 delete d | o d-1 delete d
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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
`````````````````````````````````````````` ``````````````````````````````````````````
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
Subcase: new copy information on both side with an actual merge happening Subcase: new copy information on both side with an actual merge happening
````````````````````````````````````````````````````````````````````````` `````````````````````````````````````````````````````````````````````````
- the "p-" branch renaming 't' to 'v' (through 'u') - the "p-" branch renaming 't' to 'v' (through 'u')
- the "q-" branch renaming 'r' to 'v' (through 'w') - the "q-" branch renaming 'r' to 'v' (through 'w')
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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)
| o f-1: rename h -> i | o f-1: rename h -> i
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
Subcase: existing copy information overwritten on one branch, with different content) Subcase: existing copy information overwritten on one branch, with different content)
````````````````````````````````````````````````````````````````````````````````````` `````````````````````````````````````````````````````````````````````````````````````
Merge: Merge:
- one with change to an unrelated file (b) - one with change to an unrelated file (b)
- one overwriting a file (t) with a rename (from r to x to t), v content is not the same as on the other branch - one overwriting a file (t) with a rename (from r to x to t), v content is not the same as on the other branch
| o r-1: rename r -> x | o r-1: rename r -> x
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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
o | d-2 re-add d o | d-2 re-add d
| | | |
o | d-1 delete d o | d-1 delete d
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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)
o | f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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)
| o g-1: update d | o g-1: update d
| | | |
o | c-1 delete d o | c-1 delete d
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
Comparing with merge restoring an untouched deleted file Comparing with merge restoring an untouched deleted file
-------------------------------------------------------- --------------------------------------------------------
Merge: Merge:
| o c-1 delete d | o c-1 delete d
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ 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
------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------
| o h-1: b -(move)-> d | o h-1: b -(move)-> d
| | | |
o | c-1 delete d o | c-1 delete d
| | | |
o | i-2: c -move-> d, s -move-> t o | i-2: c -move-> d, s -move-> t
| | | |
o | i-1: a -move-> c, p -move-> s o | i-1: a -move-> c, p -move-> s
|/ |/
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
Variant of previous with extra changes introduced by the merge Variant of previous with extra changes introduced by the merge
-------------------------------------------------------------- --------------------------------------------------------------
Multiple cases above explicitely test cases where content are the same on both side during merge. In this section we will introduce variants for theses cases where new change are introduced to these file content during the merges. Multiple cases above explicitely test cases where content are the same on both side during merge. In this section we will introduce variants for theses cases where new change are introduced to these file content during the merges.
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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
``````````````````````````````````````````````` ```````````````````````````````````````````````
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
Subcase: chaining conflicting rename resolution, with actual merging happening Subcase: chaining conflicting rename resolution, with actual merging happening
`````````````````````````````````````````````````````````````````````````````` ``````````````````````````````````````````````````````````````````````````````
The "mPQm" and "mQPm" case create a rename tracking conflict on file 't'. We The "mPQm" and "mQPm" case create a rename tracking conflict on file 't'. We
add more change on the respective branch and merge again. These second merge add more change on the respective branch and merge again. These second merge
does not involve the file 't' and the arbitration done within "mPQm" and "mQP" does not involve the file 't' and the arbitration done within "mPQm" and "mQP"
o | p-2: u -move-> v o | p-2: u -move-> v
| | | |
o | p-1: t -move-> u o | p-1: t -move-> u
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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.
o | c-1 delete d o | c-1 delete d
| | | |
| o b-1: b update | o b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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.
o | f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
Subcase: chaining conflicting rename resolution, with extra change during the merge Subcase: chaining conflicting rename resolution, with extra change during the merge
``````````````````````````````````````````````````````````````````````````````````` ```````````````````````````````````````````````````````````````````````````````````
The "mEA-change-m-0" and "mAE-change-m-0" case create a rename tracking conflict on file 'f'. We The "mEA-change-m-0" and "mAE-change-m-0" case create a rename tracking conflict on file 'f'. We
add more change on the respective branch and merge again. These second merge add more change on the respective branch and merge again. These second merge
does not involve the file 'f' and the arbitration done within "mAEm" and "mEA" does not involve the file 'f' and the arbitration done within "mAEm" and "mEA"
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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)
$ hg log -T '{desc|firstline}\n'| sort $ hg log -T '{desc|firstline}\n'| sort
a-1: d -move-> e a-1: d -move-> e
a-2: e -move-> f a-2: e -move-> f
b-1: b update b-1: b update
c-1 delete d c-1 delete d
d-1 delete d d-1 delete d
d-2 re-add d d-2 re-add d
e-1 b -move-> g e-1 b -move-> g
e-2 g -move-> f e-2 g -move-> f
f-1: rename h -> i f-1: rename h -> i
f-2: rename i -> d f-2: rename i -> d
g-1: update d g-1: update d
h-1: b -(move)-> d h-1: b -(move)-> d
i-0 initial commit: a b h i-0 initial commit: a b h p q r
i-1: a -move-> c, p -move-> s i-1: a -move-> c, p -move-> s
i-2: c -move-> d, s -move-> t i-2: c -move-> d, s -move-> t
j-1: unrelated changes (based on the "a" series of changes) j-1: unrelated changes (based on the "a" series of changes)
k-1: unrelated changes (based on "e" changes) k-1: unrelated changes (based on "e" changes)
l-1: unrelated changes (based on "c" changes) l-1: unrelated changes (based on "c" changes)
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
mAE,Km: chained merges (conflict -> simple) - same content everywhere mAE,Km: chained merges (conflict -> simple) - same content everywhere
mAE-change,Km: chained merges (conflict+change -> simple) - same content on both branch in the initial merge mAE-change,Km: chained merges (conflict+change -> simple) - same content on both branch in the initial merge
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ 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
| o c-1 delete d | o c-1 delete d
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
- 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")'
| o d-1 delete d | o d-1 delete d
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ 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")'
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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'
2ff93c643948464ee1f871867910ae43a45b0bea 644 f 2ff93c643948464ee1f871867910ae43a45b0bea 644 f
$ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f'
2ff93c643948464ee1f871867910ae43a45b0bea 644 f 2ff93c643948464ee1f871867910ae43a45b0bea 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f
| o f-1: rename h -> i | o f-1: rename h -> i
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ 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
A t A t
p p
R a R a
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 f-2: rename i -> d o f-2: rename i -> d
| |
o f-1: rename h -> i o f-1: rename h -> i
: :
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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 i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
~ ~
#endif #endif
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mFBm-0")' d $ hg log -Gfr 'desc("mFBm-0")' d
o f-2: rename i -> d o f-2: rename i -> d
| |
o f-1: rename h -> i o f-1: rename h -> i
: :
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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 i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
~ ~
#endif #endif
| o r-1: rename r -> x | o r-1: rename r -> x
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBRm-0")' $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBRm-0")'
M b M b
A d A d
a a
A t A t
r r
R a R a
R x R x
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mBRm-0")' d $ hg log -Gfr 'desc("mBRm-0")' d
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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("mBRm-0")' d $ hg log -Gfr 'desc("mBRm-0")' d
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
~ ~
#endif #endif
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mRBm-0")' d $ hg log -Gfr 'desc("mRBm-0")' d
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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("mRBm-0")' d $ hg log -Gfr 'desc("mRBm-0")' d
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
~ ~
#endif #endif
o | d-2 re-add d o | d-2 re-add d
| | | |
o | d-1 delete d o | d-1 delete d
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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")'
| o g-1: update d | o g-1: update d
| | | |
o | d-2 re-add d o | d-2 re-add d
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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 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 g-1: update d | o g-1: update d
| | | |
| o g-1: update d | o g-1: update d
| | | |
o | d-2 re-add d o | d-2 re-add d
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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 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 g-1: update d | o g-1: update d
| | | |
o | f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
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:
o | f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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 g-1: update d o g-1: update d
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o | f-2: rename i -> d o | f-2: rename i -> d
| | | |
o | f-1: rename h -> i o | f-1: rename h -> i
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#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 g-1: update d o g-1: update d
| |
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o | p-2: u -move-> v o | p-2: u -move-> v
| | | |
o | p-1: t -move-> u o | p-1: t -move-> u
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#if no-changeset #if no-changeset
$ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v' $ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v'
0946c662ef16e4e67397fd717389eb6693d41749 644 v 0946c662ef16e4e67397fd717389eb6693d41749 644 v
$ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v' $ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v'
0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644 v 0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644 v
$ hg manifest --debug --rev 'desc("p-2")' | grep '644 v' $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v'
| o g-1: update d | o g-1: update d
| | | |
o | c-1 delete d o | c-1 delete d
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
'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 !)
A t A t
| o c-1 delete d | o c-1 delete d
| | | |
o | b-1: b update o | b-1: b update
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
'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 !)
| o h-1: b -(move)-> d | o h-1: b -(move)-> d
| | | |
o | c-1 delete d o | c-1 delete d
| | | |
o | i-2: c -move-> d, s -move-> t o | i-2: c -move-> d, s -move-> t
| | | |
o | i-1: a -move-> c, p -move-> s o | i-1: a -move-> c, p -move-> s
|/ |/
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
$ 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 !)
A t A t
p p
R a R a
o | a-2: e -move-> f o | a-2: e -move-> f
| | | |
o | a-1: d -move-> e o | a-1: d -move-> e
|/ |/
o i-2: c -move-> d, s -move-> t o i-2: c -move-> d, s -move-> t
| |
o i-1: a -move-> c, p -move-> s o i-1: a -move-> c, p -move-> s
| |
o i-0 initial commit: a b h o i-0 initial commit: a b h p q r
#if no-changeset #if no-changeset
$ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f'
2f649fba7eb284e720d02b61f0546fcef694c045 644 f 2f649fba7eb284e720d02b61f0546fcef694c045 644 f
$ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644 f'
774e7c1637d536b99e2d8ef16fd731f87a82bd09 644 f 774e7c1637d536b99e2d8ef16fd731f87a82bd09 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f