This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8988

merge: store commitinfo if mergetool resolved a dc or cd conflict
ClosedPublic

Authored by pulkit on Sep 5 2020, 3:10 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG4c8a93ec6908: merge: store commitinfo if these is a dc or cd conflict
Summary

delete-changed or changed-delete conflicts can be resolved by mergetool, either
if some tool is passed and using or by user choose something on prompt.

If the user decides to keep the changed side, on commit we just reuse the parent
filenode. This is mostly fine unless we are in a distributed environment and
people are doing criss-cross merges.

Since, we don't have recursive merges or any other way of describing the end
result of the merge was an explicit choice and it should be differentiated from
it's ancestors, merge algo during criss-cross merges fails to take in account
the explicit choice made by user and end up with a what-can-be-said-wrong-merge.

The solution which we are trying to fix this is by creating a filenode on commit
instead of reusing the parent filenode. This helps differentiate between
pre-merged filenode and post-merge filenode and kind of tells about the choice
user made.

To implement creating new filenode functionality, we store info about these
files in mergestate so that we can read them on commit and force create a new
filenode.

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

pulkit created this revision.Sep 5 2020, 3:10 AM
pulkit updated this revision to Diff 22587.Sep 9 2020, 9:44 AM
marmoute requested changes to this revision.Sep 11 2020, 5:12 AM
marmoute added a subscriber: marmoute.
marmoute added inline comments.
mercurial/merge.py
1639

We should get something more descriptive here. like:

Instead of:

merge code:  "sudo make a new file node"
commit code: "okay, I guess"

More

merge code:  "This file might have been deleted by the merge"
commit code: "ho ho ho, I'll use a new filenode to convey that !"
This revision now requires changes to proceed.Sep 11 2020, 5:12 AM
marmoute added inline comments.Sep 11 2020, 5:17 AM
tests/test-merge-criss-cross.t
534

We should introduce the hg debugmergstate in a previous changeset so that we know what change this one introduce. Should we not ?

pulkit added a commit: rHG4c8a93ec6908: merge: store commitinfo if these is a dc or cd conflict.Sep 28 2020, 7:20 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4c8a93ec6908: merge: store commitinfo if these is a dc or cd conflict (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 22873

mercurial/merge.py

) )
else: else:
mresult.addfile( mresult.addfile(
f, f,
mergestatemod.ACTION_CHANGED_DELETED, mergestatemod.ACTION_CHANGED_DELETED,
(f, None, f, False, pa.node()), (f, None, f, False, pa.node()),
b'prompt changed/deleted', b'prompt changed/deleted',
) )
if branchmerge:
mresult.addcommitinfo(
f, b'merge-removal-candidate', b'yes'
)
elif n1 == addednodeid: elif n1 == addednodeid:
# This file was locally added. We should forget it instead of # This file was locally added. We should forget it instead of
# deleting it. # deleting it.
mresult.addfile( mresult.addfile(
f, mergestatemod.ACTION_FORGET, None, b'remote deleted', f, mergestatemod.ACTION_FORGET, None, b'remote deleted',
) )
else: else:
mresult.addfile( mresult.addfile(
) )
else: else:
mresult.addfile( mresult.addfile(
f, f,
mergestatemod.ACTION_DELETED_CHANGED, mergestatemod.ACTION_DELETED_CHANGED,
(None, f, f, False, pa.node()), (None, f, f, False, pa.node()),
b'prompt deleted/changed', b'prompt deleted/changed',
) )
if branchmerge:
mresult.addcommitinfo(
f, b'merge-removal-candidate', b'yes'
)
else: else:
mresult.addfile( mresult.addfile(
f, f,
mergestatemod.ACTION_KEEP_ABSENT, mergestatemod.ACTION_KEEP_ABSENT,
None, None,
b'local not present, remote unchanged', b'local not present, remote unchanged',
) )
msupdated, msmerged, msremoved = ms.counts() msupdated, msmerged, msremoved = ms.counts()
updated += msupdated updated += msupdated
merged += msmerged merged += msmerged
removed += msremoved removed += msremoved
extraactions = ms.actions() extraactions = ms.actions()
if extraactions: if extraactions:
for k, acts in pycompat.iteritems(extraactions): for k, acts in pycompat.iteritems(extraactions):
for a in acts: for a in acts:
marmouteUnsubmitted
Not Done

We should get something more descriptive here. like:

Instead of:

merge code:  "sudo make a new file node"
commit code: "okay, I guess"

More

merge code:  "This file might have been deleted by the merge"
commit code: "ho ho ho, I'll use a new filenode to convey that !"
marmoute: We should get something more descriptive here. like: Instead of: ``` merge code: "sudo make…
mresult.addfile(a[0], k, *a[1:]) mresult.addfile(a[0], k, *a[1:])
if k == mergestatemod.ACTION_GET and wantfiledata: if k == mergestatemod.ACTION_GET and wantfiledata:
# no filedata until mergestate is updated to provide it # no filedata until mergestate is updated to provide it
for a in acts: for a in acts:
getfiledata[a[0]] = None getfiledata[a[0]] = None
progress.complete() progress.complete()
assert len(getfiledata) == ( assert len(getfiledata) == (

tests/test-merge-changedelete.t

--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u") file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "u") file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "u") file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r") file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "r") file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "u") file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r") file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "r") file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "u") file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r") file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "u") file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "u") file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r") file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "r") file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "r") file: file3 (state "r")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "r") file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "r") file: file2 (state "r")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "r") file: file3 (state "r")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u") file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "u") file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "u") file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u") file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "u") file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "u") file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u") file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "u") file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "u") file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- debugmergestate --- --- debugmergestate ---
local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
file: file1 (state "u") file: file1 (state "u")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node 0000000000000000000000000000000000000000) other path: file1 (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file2 (state "u") file: file2 (state "u")
local path: file2 (hash 0000000000000000000000000000000000000000, flags "") local path: file2 (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
extra: merge-removal-candidate = yes
file: file3 (state "u") file: file3 (state "u")
local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed

tests/test-merge-criss-cross.t

Do all the merge combination (from the deleted or the update side × keeping and deleting the file Do all the merge combination (from the deleted or the update side × keeping and deleting the file
$ hg update 'desc("delete-the-file")' $ hg update 'desc("delete-the-file")'
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("updating-both-file")' -t :local $ hg merge 'desc("updating-both-file")' -t :local
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 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 debugmergestate $ hg debugmergestate
marmouteUnsubmitted
Not Done

We should introduce the hg debugmergstate in a previous changeset so that we know what change this one introduce. Should we not ?

marmoute: We should introduce the `hg debugmergstate` in a previous changeset so that we know what change…
local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071 other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071
file: the-file (state "r") file: the-file (state "r")
local path: the-file (hash 0000000000000000000000000000000000000000, flags "") local path: the-file (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a) ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460) other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589 extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
extra: merge-removal-candidate = yes
extra: other-file (filenode-source = other) extra: other-file (filenode-source = other)
$ hg ci -m "merge-deleting-the-file-from-deleted" $ hg ci -m "merge-deleting-the-file-from-deleted"
$ hg manifest $ hg manifest
other-file other-file
$ hg debugrevlogindex the-file $ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000 0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 000000000000 1 1 59e363a07dc8 4b69178b9bda 000000000000
$ hg update 'desc("updating-both-file")' $ hg update 'desc("updating-both-file")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("delete-the-file")' -t :other $ hg merge 'desc("delete-the-file")' -t :other
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg debugmergestate $ hg debugmergestate
local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071 local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071
other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
file: the-file (state "r") file: the-file (state "r")
local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "") local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a) ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
other path: the-file (node 0000000000000000000000000000000000000000) other path: the-file (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589 extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
extra: merge-removal-candidate = yes
$ hg ci -m "merge-deleting-the-file-from-updated" $ hg ci -m "merge-deleting-the-file-from-updated"
created new head created new head
$ hg manifest $ hg manifest
other-file other-file
$ hg debugrevlogindex the-file $ hg debugrevlogindex the-file
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 0 4b69178b9bda 000000000000 000000000000 0 0 4b69178b9bda 000000000000 000000000000
1 1 59e363a07dc8 4b69178b9bda 000000000000 1 1 59e363a07dc8 4b69178b9bda 000000000000
$ hg update 'desc("delete-the-file")' $ hg update 'desc("delete-the-file")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("updating-both-file")' -t :other $ hg merge 'desc("updating-both-file")' -t :other
1 files updated, 1 files merged, 0 files removed, 0 files unresolved 1 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 debugmergestate $ hg debugmergestate
local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071 other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071
file: the-file (state "r") file: the-file (state "r")
local path: the-file (hash 0000000000000000000000000000000000000000, flags "") local path: the-file (hash 0000000000000000000000000000000000000000, flags "")
ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a) ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460) other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460)
extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589 extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
extra: merge-removal-candidate = yes
extra: other-file (filenode-source = other) extra: other-file (filenode-source = other)
$ hg ci -m "merge-keeping-the-file-from-deleted" $ hg ci -m "merge-keeping-the-file-from-deleted"
created new head created new head
$ hg manifest $ hg manifest
other-file other-file
the-file the-file
XXX: This should create a new filenode because user explicitly decided to keep XXX: This should create a new filenode because user explicitly decided to keep
$ hg debugmergestate $ hg debugmergestate
local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071 local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071
other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b
file: the-file (state "r") file: the-file (state "r")
local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "") local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "")
ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a) ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a)
other path: the-file (node 0000000000000000000000000000000000000000) other path: the-file (node 0000000000000000000000000000000000000000)
extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589 extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589
extra: merge-removal-candidate = yes
$ hg ci -m "merge-keeping-the-file-from-updated" $ hg ci -m "merge-keeping-the-file-from-updated"
created new head created new head
$ hg manifest $ hg manifest
other-file other-file
the-file the-file
XXX: This should create a new filenode because user explicitly decided to keep XXX: This should create a new filenode because user explicitly decided to keep
the file. If we reuse the same filenode, future merges (criss-cross ones mostly) the file. If we reuse the same filenode, future merges (criss-cross ones mostly)