This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9195

copies: split creation of the graph and actual checking again
ClosedPublic

Authored by marmoute on Oct 13 2020, 6:39 AM.

Details

Reviewers
martinvonz
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4ffe502673c3: copies: split creation of the graph and actual checking again
Summary

The re-install the old split. It will be necessary to test that the upgrade
process produced a functionally identical result. It will be useful to detect
case where the metadata we look at identical, but some other items we did not
checked are missing.

(spoiler: we will find some bug)

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.Oct 13 2020, 6:39 AM
martinvonz added subscribers: pulkit, martinvonz.Oct 13 2020, 11:05 AM
martinvonz requested changes to this revision.

I really don't like this patch. I did the split back in D8377 because I found this format very hard to read. IIRC, at least @pulkit agreed with me. I don't understand why testing of upgrades require this structure.

This revision now requires changes to proceed.Oct 13 2020, 11:05 AM
marmoute added a comment.Oct 13 2020, 2:37 PM
In D9195#138226, @martinvonz wrote:

I really don't like this patch. I did the split back in D8377 because I found this format very hard to read. IIRC, at least @pulkit agreed with me. I don't understand why testing of upgrades require this structure.

Because to test the upgrade process, we need all the test-case changeset to be created before we run the upgrade itself.

pulkit added a comment.Oct 14 2020, 3:21 AM

(spoiler: we will find some bug)

Unable to find the bug in upcoming patches.

In D9195#138236, @marmoute wrote:
In D9195#138226, @martinvonz wrote:

I really don't like this patch. I did the split back in D8377 because I found this format very hard to read. IIRC, at least @pulkit agreed with me. I don't understand why testing of upgrades require this structure.

Because to test the upgrade process, we need all the test-case changeset to be created before we run the upgrade itself.

Hm, we can run upgrade in the end then from what I understand.

marmoute added a comment.Oct 14 2020, 4:38 AM
In D9195#138266, @pulkit wrote:

(spoiler: we will find some bug)

Unable to find the bug in upcoming patches.

The bug is fixed in D9199. Before that patch, the upgrade process was computing copy related sidedata, but failed to set some revlog related flag to mark that changeset was relevant to copy tracing. As a result using an upgraded repository for copytracing returned bad result. When the original test was written, the upgrade worked fine, however, when we later introduced this new flag (for performance reason) the feature silently broke without the test noticing that.

To me this silent breakage highlight the need for more thoughtful testing of the upgrade. We need more that just checking that the upgrade ran without crashing and that some metadata are there. We need to actually check that an upgraded repository can do copy tracing as fine as a repository that was using the feature from the start. That way, we can detect future breackage coming from code/data area we did not expected.

In D9195#138236, @marmoute wrote:
In D9195#138226, @martinvonz wrote:

I really don't like this patch. I did the split back in D8377 because I found this format very hard to read. IIRC, at least @pulkit agreed with me. I don't understand why testing of upgrades require this structure.

Because to test the upgrade process, we need all the test-case changeset to be created before we run the upgrade itself.

Hm, we can run upgrade in the end then from what I understand.

My ultimate goal here is to have the tests in this file to run on a upgraded repository. To do so I need the following this to happens in a specific order :

  1. create changeset without copy tracing sidedata
  2. run the repository upgrade to add copy tracing sidedata
  3. check that the copy tracing is yielding that result we want

The upgrade process can only run once. So I need all the changesets created because I run it. Once the upgrade is done, I can check the copy tracing behavior.

Is this clearer to you?

pulkit accepted this revision.Oct 15 2020, 2:55 PM

I spent some time this afternoon why we cannot just run upgrade in the end and what we want to test. While both me and @martinvonz stills feels like old structure of test was more better and easier to understand, this patch looks fine to me as it increase test coverage related to upgrade and help fix a bug.

This fails to apply on tip of the default branch, kindly rebase and resend (there are 3-4 small conflicts).

marmoute added a comment.Oct 15 2020, 5:06 PM
In D9195#138473, @pulkit wrote:

I spent some time this afternoon why we cannot just run upgrade in the end and what we want to test. While both me and @martinvonz stills feels like old structure of test was more better and easier to understand, this patch looks fine to me as it increase test coverage related to upgrade and help fix a bug.
This fails to apply on tip of the default branch, kindly rebase and resend (there are 3-4 small conflicts).

The conflict happens in moved code so it always tricky to solve confidently right, but I think I eventually got it right. Sending update now.

marmoute updated this revision to Diff 23229.Oct 15 2020, 5:06 PM
pulkit accepted this revision.Oct 16 2020, 3:22 AM
marmoute added a commit: rHG4ffe502673c3: copies: split creation of the graph and actual checking again.Oct 16 2020, 3:48 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4ffe502673c3: copies: split creation of the graph and actual checking again (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 (591 lines)

Diff 23242

tests/test-copies-chain-merge.t

| |
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
Setup all merge
===============
This is done beforehand to validate that the upgrade process creates valid copy
information.
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 up 'desc("b-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("a-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mBAm-0 simple merge - one way'
$ hg up 'desc("a-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mABm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
@ 12 mABm-0 simple merge - the other way
|\
+---o 11 mBAm-0 simple merge - one way
| |/
| o 5 b-1: b update
| |
o | 4 a-2: e -move-> f
| |
o | 3 a-1: d -move-> e
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
merging with the side having a delete
-------------------------------------
case summary:
- one with change to an unrelated file
- one deleting the change
and recreate an unrelated file after the merge
$ hg up 'desc("b-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mBCm-0 simple merge - one way'
$ echo bar > d
$ hg add d
$ hg ci -m 'mBCm-1 re-add d'
$ hg up 'desc("c-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mCBm-0 simple merge - the other way'
created new head
$ echo bar > d
$ hg add d
$ hg ci -m 'mCBm-1 re-add d'
$ hg log -G --rev '::(desc("mCBm")+desc("mBCm"))'
@ 16 mCBm-1 re-add d
|
o 15 mCBm-0 simple merge - the other way
|\
| | o 14 mBCm-1 re-add d
| | |
+---o 13 mBCm-0 simple merge - one way
| |/
| o 6 c-1 delete d
| |
o | 5 b-1: b update
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Comparing with a merge re-adding the file afterward
---------------------------------------------------
Merge:
- one with change to an unrelated file
- one deleting and recreating the change
$ hg up 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mBDm-0 simple merge - one way'
$ hg up 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mDBm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
@ 18 mDBm-0 simple merge - the other way
|\
+---o 17 mBDm-0 simple merge - one way
| |/
| o 8 d-2 re-add d
| |
| o 7 d-1 delete d
| |
o | 5 b-1: b update
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Comparing with a merge with colliding rename
--------------------------------------------
- the "e-" branch renaming b to f (through 'g')
- the "a-" branch renaming d to f (through e)
$ hg up 'desc("a-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("e-2")' --tool :union
merging f
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mAEm-0 simple merge - one way'
$ hg up 'desc("e-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("a-2")' --tool :union
merging f
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mEAm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mAEm")+desc("mEAm"))'
@ 20 mEAm-0 simple merge - the other way
|\
+---o 19 mAEm-0 simple merge - one way
| |/
| o 10 e-2 g -move-> f
| |
| o 9 e-1 b -move-> g
| |
o | 4 a-2: e -move-> f
| |
o | 3 a-1: d -move-> e
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Merge:
- one with change to an unrelated file (b)
- one overwriting a file (d) with a rename (from h to i to d)
$ hg up 'desc("i-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv h i
$ hg commit -m "f-1: rename h -> i"
created new head
$ hg mv --force i d
$ hg commit -m "f-2: rename i -> d"
$ hg debugindex d
rev linkrev nodeid p1 p2
0 2 169be882533b 000000000000 000000000000 (no-changeset !)
0 2 b789fdd96dc2 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000
2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !)
2 22 fe6f8b4f507f 000000000000 000000000000 (changeset !)
$ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mBFm-0 simple merge - one way'
$ hg up 'desc("f-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mFBm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mBFm")+desc("mFBm"))'
@ 24 mFBm-0 simple merge - the other way
|\
+---o 23 mBFm-0 simple merge - one way
| |/
| o 22 f-2: rename i -> d
| |
| o 21 f-1: rename h -> i
| |
o | 5 b-1: b update
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Merge:
- one with change to a file
- one deleting and recreating the file
Unlike in the 'BD/DB' cases, an actual merge happened here. So we should
consider history and rename on both branch of the merge.
$ hg up 'desc("i-2")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "some update" >> d
$ hg commit -m "g-1: update d"
created new head
$ hg up 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("g-1")' --tool :union
merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mDGm-0 simple merge - one way'
$ hg up 'desc("g-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("d-2")' --tool :union
merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mGDm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mDGm")+desc("mGDm"))'
@ 27 mGDm-0 simple merge - the other way
|\
+---o 26 mDGm-0 simple merge - one way
| |/
| o 25 g-1: update d
| |
o | 8 d-2 re-add d
| |
o | 7 d-1 delete d
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Merge:
- one with change to a file (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
history are relevant.
Note:
| 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".
|
| The current code arbitrarily pick one side
$ hg up 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("g-1")' --tool :union
merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mFGm-0 simple merge - one way'
created new head
$ hg up 'desc("g-1")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")' --tool :union
merging d
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mGFm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mGFm")+desc("mFGm"))'
@ 29 mGFm-0 simple merge - the other way
|\
+---o 28 mFGm-0 simple merge - one way
| |/
| o 25 g-1: update d
| |
o | 22 f-2: rename i -> d
| |
o | 21 f-1: rename h -> i
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
Comparing with merging with a deletion (and keeping the file)
-------------------------------------------------------------
Merge:
- one removing a file (d)
- one updating that file
- 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
copy tracing chain.
$ hg up 'desc("c-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("g-1")'
file 'd' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg resolve -t :other d
(no more unresolved files)
$ hg ci -m "mCGm-0"
created new head
$ hg up 'desc("g-1")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("c-1")'
file 'd' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg resolve -t :local d
(no more unresolved files)
$ hg ci -m "mGCm-0"
created new head
$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
@ 31 mGCm-0
|\
+---o 30 mCGm-0
| |/
| o 25 g-1: update d
| |
o | 6 c-1 delete d
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
$ hg up 'desc("b-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("a-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved Comparing with merge restoring an untouched deleted file
(branch merge, don't forget to commit) --------------------------------------------------------
$ hg ci -m 'mBAm-0 simple merge - one way'
$ hg up 'desc("a-2")' Merge:
1 files updated, 0 files merged, 0 files removed, 0 files unresolved - one removing a file (d)
- one leaving the file untouched
- 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
copy tracing chain.
$ hg up 'desc("c-1")'
0 files updated, 0 files merged, 1 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 revert --rev 'desc("b-1")' d
$ hg ci -m "mCB-revert-m-0"
created new head
$ hg up 'desc("b-1")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg revert --rev 'desc("b-1")' d
$ hg ci -m "mBC-revert-m-0"
created new head created new head
$ hg log -G --rev '::(desc("mCB-revert-m")+desc("mBC-revert-m"))'
@ 33 mBC-revert-m-0
|\
+---o 32 mCB-revert-m-0
| |/
| o 6 c-1 delete d
| |
o | 5 b-1: b update
|/
o 2 i-2: c -move-> d
|
o 1 i-1: a -move-> c
|
o 0 i-0 initial commit: a b h
$ hg up null --quiet
Test copy information chaining
==============================
merging with unrelated change does not interfere with the renames
---------------------------------------------------------------
- rename on one side
- unrelated change on the other side
$ hg log -G --rev '::(desc("mABm")+desc("mBAm"))' $ hg log -G --rev '::(desc("mABm")+desc("mBAm"))'
@ 12 mABm-0 simple merge - the other way o 12 mABm-0 simple merge - the other way
|\ |\
+---o 11 mBAm-0 simple merge - one way +---o 11 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
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
- 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")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mBCm-0 simple merge - one way'
$ echo bar > d
$ hg add d
$ hg ci -m 'mBCm-1 re-add d'
$ hg up 'desc("c-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mCBm-0 simple merge - the other way'
created new head
$ echo bar > d
$ hg 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 o 16 mCBm-1 re-add d
| |
o 15 mCBm-0 simple merge - the other way o 15 mCBm-0 simple merge - the other way
|\ |\
| | o 14 mBCm-1 re-add d | | o 14 mBCm-1 re-add d
| | | | | |
+---o 13 mBCm-0 simple merge - one way +---o 13 mBCm-0 simple merge - one way
| |/ | |/
| o 6 c-1 delete d | o 6 c-1 delete d
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("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mBDm-0 simple merge - one way'
$ hg up 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mDBm-0 simple merge - the other way'
created new head
$ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))' $ hg log -G --rev '::(desc("mDBm")+desc("mBDm"))'
@ 18 mDBm-0 simple merge - the other way o 18 mDBm-0 simple merge - the other way
|\ |\
+---o 17 mBDm-0 simple merge - one way +---o 17 mBDm-0 simple merge - one way
| |/ | |/
| o 8 d-2 re-add d | o 8 d-2 re-add d
| | | |
| o 7 d-1 delete d | o 7 d-1 delete d
| | | |
o | 5 b-1: b update o | 5 b-1: b update
$ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d' $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
169be882533bc917905d46c0c951aa9a1e288dcf 644 d (no-changeset !) 169be882533bc917905d46c0c951aa9a1e288dcf 644 d (no-changeset !)
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 d (changeset !) b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 d (changeset !)
$ hg debugindex d $ hg debugindex d | head -n 4
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 2 169be882533b 000000000000 000000000000 (no-changeset !) 0 2 169be882533b 000000000000 000000000000 (no-changeset !)
0 2 b789fdd96dc2 000000000000 000000000000 (changeset !) 0 2 b789fdd96dc2 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000 1 8 b004912a8510 000000000000 000000000000
2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !)
2 22 fe6f8b4f507f 000000000000 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
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mBDm-0")' d $ hg log -Gfr 'desc("mBDm-0")' d
o 8 d-2 re-add d o 8 d-2 re-add d
| |
~ ~
Comparing with a merge with colliding rename Comparing with a merge with colliding rename
-------------------------------------------- --------------------------------------------
- the "e-" branch renaming b to f (through 'g') - the "e-" branch renaming b to f (through 'g')
- the "a-" branch renaming d to f (through e) - the "a-" branch renaming d to f (through e)
$ hg up 'desc("a-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("e-2")' --tool :union
merging f
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mAEm-0 simple merge - one way'
$ hg up 'desc("e-2")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("a-2")' --tool :union
merging f
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mEAm-0 simple merge - the other way'
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 o 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 10 e-2 g -move-> f | o 10 e-2 g -move-> f
| | | |
| o 9 e-1 b -move-> g | o 9 e-1 b -move-> g
| | | |
o | 4 a-2: e -move-> f o | 4 a-2: e -move-> f
| 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:
- 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("i-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv h i
$ hg commit -m "f-1: rename h -> i"
created new head
$ hg mv --force i d
$ hg commit -m "f-2: rename i -> d"
$ hg debugindex d
rev linkrev nodeid p1 p2
0 2 169be882533b 000000000000 000000000000 (no-changeset !)
0 2 b789fdd96dc2 000000000000 000000000000 (changeset !)
1 8 b004912a8510 000000000000 000000000000
2 22 4a067cf8965d 000000000000 000000000000 (no-changeset !)
2 22 fe6f8b4f507f 000000000000 000000000000 (changeset !)
$ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mBFm-0 simple merge - one way'
$ hg up 'desc("f-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mFBm-0 simple merge - the other way'
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 o 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
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 up 'desc("i-2")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "some update" >> d
$ hg commit -m "g-1: update d"
created new head
$ hg up 'desc("d-2")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("g-1")' --tool :union
merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mDGm-0 simple merge - one way'
$ hg up 'desc("g-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("d-2")' --tool :union
merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mGDm-0 simple merge - the other way'
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 o 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 | 8 d-2 re-add d o | 8 d-2 re-add d
| | | |
o | 7 d-1 delete d o | 7 d-1 delete d
history are relevant. history are relevant.
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 | The current code arbitrarily pick one side
$ hg up 'desc("f-2")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("g-1")' --tool :union
merging d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mFGm-0 simple merge - one way'
created new head
$ hg up 'desc("g-1")'
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("f-2")' --tool :union
merging d
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m 'mGFm-0 simple merge - the other way'
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 o 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
| |
~ ~
#endif #endif
#if no-changeset #if no-changeset
$ hg log -Gfr 'desc("mGFm-0")' d $ hg log -Gfr 'desc("mGFm-0")' d
@ 29 mGFm-0 simple merge - the other way o 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
#else #else
$ hg log -Gfr 'desc("mGFm-0")' d $ hg log -Gfr 'desc("mGFm-0")' d
@ 29 mGFm-0 simple merge - the other way o 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 2 i-2: c -move-> d o 2 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 up 'desc("c-1")'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("g-1")'
file 'd' was deleted in local [working copy] but was modified in other [merge rev].
You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg resolve -t :other d
(no more unresolved files)
$ hg ci -m "mCGm-0"
created new head
$ hg up 'desc("g-1")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("c-1")'
file 'd' was deleted in other [merge rev] but was modified in local [working copy].
You can use (c)hanged version, (d)elete, or leave (u)nresolved.
What do you want to do? u
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ hg resolve -t :local d
(no more unresolved files)
$ hg ci -m "mGCm-0"
created new head
$ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))' $ hg log -G --rev '::(desc("mCGm")+desc("mGCm"))'
@ 31 mGCm-0 o 31 mGCm-0
|\ |\
+---o 30 mCGm-0 +---o 30 mCGm-0
| |/ | |/
| o 25 g-1: update d | o 25 g-1: update d
| | | |
o | 6 c-1 delete d o | 6 c-1 delete d
|/ |/
o 2 i-2: c -move-> d o 2 i-2: c -move-> d
Merge: Merge:
- 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 up 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 'desc("b-1")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg revert --rev 'desc("b-1")' d
$ hg ci -m "mCB-revert-m-0"
created new head
$ hg up 'desc("b-1")'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("c-1")'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg revert --rev 'desc("b-1")' d
$ hg ci -m "mBC-revert-m-0"
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 o 33 mBC-revert-m-0
|\ |\
+---o 32 mCB-revert-m-0 +---o 32 mCB-revert-m-0
| |/ | |/
| o 6 c-1 delete d | o 6 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