This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8942

debugmergestate: show extras for files which are not in mergestate
ClosedPublic

Authored by pulkit on Aug 24 2020, 10:15 AM.

Details

Reviewers
durin42
marmoute
Group Reviewers
hg-reviewers
Commits
rHG766797f23f77: debugmergestate: show extras for files which are not in mergestate
Summary

With recent changes and future changes, we will like to store extras information
about files which were merged automatically. Hence, we will have merge extras
for files which are not in the mergestate.

Diff Detail

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

Event Timeline

pulkit created this revision.Aug 24 2020, 10:15 AM
marmoute added a subscriber: marmoute.Aug 26 2020, 12:48 PM

SIlly question: Would it make sense to still like the extra for files we have in the mergestate. And have other line for the file that have extra without being in the mergestate?

pulkit retitled this revision from debugmergestate: don't next `extras` under `files` to debugmergestate: show extras for files which are not in mergestate.Aug 27 2020, 5:38 AM
pulkit edited the summary of this revision. (Show Details)
pulkit added a child revision: D8965: merge: update commitinfo from all mergeresults during bid merge.
pulkit updated this revision to Diff 22475.
marmoute accepted this revision.Sep 11 2020, 8:50 AM

Thanks for the update.

pulkit added a commit: rHG766797f23f77: debugmergestate: show extras for files which are not in mergestate.Sep 11 2020, 11:26 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG766797f23f77: debugmergestate: show extras for files which are not in mergestate (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 22433

mercurial/debugcommands.py

b' local path: {local_path} (hash {local_key}, flags \\"{local_flags}\\")\n' b' local path: {local_path} (hash {local_key}, flags \\"{local_flags}\\")\n'
b' ancestor path: {ancestor_path} (node {ancestor_node})\n' b' ancestor path: {ancestor_path} (node {ancestor_node})\n'
b' other path: {other_path} (node {other_node})\n' b' other path: {other_path} (node {other_node})\n'
b'")}' b'")}'
b'{if(rename_side, "' b'{if(rename_side, "'
b' rename side: {rename_side}\n' b' rename side: {rename_side}\n'
b' renamed path: {renamed_path}\n' b' renamed path: {renamed_path}\n'
b'")}' b'")}'
b'{extras % " extra: {key} = {value}\n"}'
b'"}' b'"}'
b'{extras % "extra: {file} ({key} = {value})\n"}'
) )
ms = mergestatemod.mergestate.read(repo) ms = mergestatemod.mergestate.read(repo)
fm = ui.formatter(b'debugmergestate', opts) fm = ui.formatter(b'debugmergestate', opts)
fm.startitem() fm.startitem()
fm_commits = fm.nested(b'commits') fm_commits = fm.nested(b'commits')
fm_files.data(other_node=state[6]) fm_files.data(other_node=state[6])
fm_files.data(local_flags=state[7]) fm_files.data(local_flags=state[7])
elif state[0] in ( elif state[0] in (
mergestatemod.MERGE_RECORD_UNRESOLVED_PATH, mergestatemod.MERGE_RECORD_UNRESOLVED_PATH,
mergestatemod.MERGE_RECORD_RESOLVED_PATH, mergestatemod.MERGE_RECORD_RESOLVED_PATH,
): ):
fm_files.data(renamed_path=state[1]) fm_files.data(renamed_path=state[1])
fm_files.data(rename_side=state[2]) fm_files.data(rename_side=state[2])
fm_extras = fm_files.nested(b'extras')
for k, v in ms.extras(f).items(): fm_files.end()
fm_extras = fm.nested(b'extras')
for f, d in sorted(ms._stateextras.iteritems()):
for k, v in d.iteritems():
fm_extras.startitem() fm_extras.startitem()
fm_extras.data(file=f)
fm_extras.data(key=k) fm_extras.data(key=k)
fm_extras.data(value=v) fm_extras.data(value=v)
fm_extras.end() fm_extras.end()
fm_files.end()
fm.end() fm.end()
@command(b'debugnamecomplete', [], _(b'NAME...')) @command(b'debugnamecomplete', [], _(b'NAME...'))
def debugnamecomplete(ui, repo, *args): def debugnamecomplete(ui, repo, *args):
'''complete "names" - tags, open branch names, bookmark names''' '''complete "names" - tags, open branch names, bookmark names'''
names = set() names = set()

tests/test-backout.t

$ hg debugmergestate -v $ hg debugmergestate -v
v1 and v2 states match: using v2 v1 and v2 states match: using v2
local: b71750c4b0fdf719734971e3ef90dbeab5919a2d local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
other: a30dd8addae3ce71b8667868478542bc417439e6 other: a30dd8addae3ce71b8667868478542bc417439e6
file: foo (state "u") file: foo (state "u")
local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "") local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "")
ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708) ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee) other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)
extra: ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553 extra: foo (ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553)
$ mv .hg/merge/state2 .hg/merge/state2-moved $ mv .hg/merge/state2 .hg/merge/state2-moved
$ hg debugmergestate -v $ hg debugmergestate -v
no version 2 merge state no version 2 merge state
local: b71750c4b0fdf719734971e3ef90dbeab5919a2d local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
other: b71750c4b0fdf719734971e3ef90dbeab5919a2d other: b71750c4b0fdf719734971e3ef90dbeab5919a2d
file: foo (state "u") file: foo (state "u")
local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "") local path: foo (hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33, flags "")
ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708) ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)

tests/test-histedit-non-commute-abort.t

$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate $ hg debugmergestate
local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
other (histedit): e860deea161a2f77de56603b340ebbb4536308ae other (histedit): e860deea161a2f77de56603b340ebbb4536308ae
file: e (state "u") file: e (state "u")
local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "") local path: e (hash 58e6b3a414a1e090dfc6029add0f3555ccba127f, flags "")
ancestor path: e (node 0000000000000000000000000000000000000000) ancestor path: e (node 0000000000000000000000000000000000000000)
other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)
extra: ancestorlinknode = 0000000000000000000000000000000000000000 extra: e (ancestorlinknode = 0000000000000000000000000000000000000000)
$ hg resolve -l $ hg resolve -l
U e U e
insert unsupported mandatory merge record insert unsupported mandatory merge record
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
$ hg debugmergestate $ hg debugmergestate
abort: unsupported merge state records: X abort: unsupported merge state records: X
(see https://mercurial-scm.org/wiki/MergeStateRecords for more information) (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)

tests/test-merge-changedelete.t

U file3 U file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
U file3 U file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
*** file2 does not exist *** file2 does not exist
--- file3 --- --- file3 ---
3 3
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
changed2 changed2
U file3 U file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
changed2 changed2
U file3 U file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
<<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan...
changed2 changed2
R file3 R file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
*** file2 does not exist *** file2 does not exist
--- file3 --- --- file3 ---
3 3
changed2 changed2
R file3 R file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
changed1 changed1
U file3 U file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
U file3 U file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
U file3 U file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
U file3 U file3
--- 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
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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
U file2 U file2
--- debugmergestate --- --- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (destination): 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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
R file2 R file2
--- debugmergestate --- --- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (destination): 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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
*** file2 does not exist *** file2 does not exist
--- file3 --- --- file3 ---
3 3
changed1 changed1
R file2 R file2
--- debugmergestate --- --- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (destination): 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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
changed1 changed1
U file2 U file2
--- debugmergestate --- --- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (destination): 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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
U file2 U file2
--- debugmergestate --- --- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (destination): 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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
U file2 U file2
--- debugmergestate --- --- debugmergestate ---
local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6 other (destination): 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
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: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
extra: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3

tests/test-rebase-abort.t

$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate $ hg debugmergestate
local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc
other (source): 46f0b057b5c061d276b91491c22151f78698abd2 other (source): 46f0b057b5c061d276b91491c22151f78698abd2
file: common (state "u") file: common (state "u")
local path: common (hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1, flags "") local path: common (hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1, flags "")
ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6) ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5) other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
extra: ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c extra: common (ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c)
$ hg resolve -l $ hg resolve -l
U common U common
Insert unsupported mandatory merge record: Insert unsupported mandatory merge record:
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
$ hg debugmergestate $ hg debugmergestate
abort: unsupported merge state records: X abort: unsupported merge state records: X

tests/test-resolve.t

$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate $ hg debugmergestate
local (working copy): 57653b9f834a4493f7240b0681efcb9ae7cab745 local (working copy): 57653b9f834a4493f7240b0681efcb9ae7cab745
other (merge rev): dc77451844e37f03f5c559e3b8529b2b48d381d1 other (merge rev): dc77451844e37f03f5c559e3b8529b2b48d381d1
file: file1 (state "r") file: file1 (state "r")
local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "")
ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd) ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d) other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
file: file2 (state "u") file: file2 (state "u")
local path: file2 (hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523, flags "") local path: file2 (hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523, flags "")
ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd) ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d) other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac extra: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
extra: file2 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
$ hg resolve -l $ hg resolve -l
R file1 R file1
U file2 U file2
test json output test json output
$ hg debugmergestate -T json $ hg debugmergestate -T json
[ [
{ {
"commits": [{"label": "working copy", "name": "local", "node": "57653b9f834a4493f7240b0681efcb9ae7cab745"}, {"label": "merge rev", "name": "other", "node": "dc77451844e37f03f5c559e3b8529b2b48d381d1"}], "commits": [{"label": "working copy", "name": "local", "node": "57653b9f834a4493f7240b0681efcb9ae7cab745"}, {"label": "merge rev", "name": "other", "node": "dc77451844e37f03f5c559e3b8529b2b48d381d1"}],
"files": [{"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file1", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "60b27f004e454aca81b0480209cce5081ec52390", "local_path": "file1", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file1", "path": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "path": "file2", "state": "u"}] "extras": [{"file": "file1", "key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}, {"file": "file2", "key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}],
"files": [{"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file1", "local_flags": "", "local_key": "60b27f004e454aca81b0480209cce5081ec52390", "local_path": "file1", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file1", "path": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "path": "file2", "state": "u"}]
} }
] ]
insert unsupported mandatory merge record insert unsupported mandatory merge record
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -X
$ hg debugmergestate $ hg debugmergestate