This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8113

debugmergestate: make templated
ClosedPublic

Authored by martinvonz on Feb 13 2020, 1:37 AM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG088ab52a04bc: debugmergestate: make templated
Summary

Our IntelliJ team wants to be able to read the merge state in order to
help the user resolve merge conflicts. They had so far been reading
file contents from p1() and p2() and their merge base. That is not
ideal for several reasons (merge base is not necessarily the "graft
base", renames are not handled, commands like hg update -m is not
handled). It will get especially bad as of my D7827. This patch makes
the output s a templated. I haven't bothered to make it complete
(e.g. merge driver states are not handled), but it's probably good
enough as a start.

I've done a web search for "debugmergestate" and I can't find any
indication that any tools currently rely on its output. If it turns
out that we get bug reports for it once this is released, I won't
object to backing this patch out on the stable branch (and then
perhaps replace it by a separate command, or put it behind a new
flag).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Feb 13 2020, 1:37 AM
durin42 added a subscriber: durin42.Feb 13 2020, 12:55 PM

Why can't we add templater support to debugmergestate instead?

martinvonz added a comment.Feb 13 2020, 1:09 PM
In D8113#120695, @durin42 wrote:

Why can't we add templater support to debugmergestate instead?

Sorry, I should have explained that in the commit message. The reason I didn't was because the current command seems to try to make the output be true to the on-disk format. Maybe that's not something we care much about, so I can just rewrite it by defining a default template. I'll try that.

martinvonz retitled this revision from debugcommands: add templated command for reading the merge state for e.g. IDEs to debugmergestate: make templated.Feb 13 2020, 4:48 PM
martinvonz edited the summary of this revision. (Show Details)
martinvonz updated this revision to Diff 20202.
pulkit added a subscriber: pulkit.Feb 13 2020, 5:43 PM

Will be nice to add some release notes either in BC section or in features section stating debugmergestate now supports templates and can be used by scripts/editors.

martinvonz added a comment.Feb 13 2020, 5:45 PM
In D8113#120745, @pulkit wrote:

Will be nice to add some release notes either in BC section or in features section stating debugmergestate now supports templates and can be used by scripts/editors.

Ah, good point, will do.
martinvonz updated this revision to Diff 20203.Feb 13 2020, 5:48 PM
martinvonz added a comment.Feb 13 2020, 5:48 PM
In D8113#120746, @martinvonz wrote:
In D8113#120745, @pulkit wrote:

Will be nice to add some release notes either in BC section or in features section stating debugmergestate now supports templates and can be used by scripts/editors.

Ah, good point, will do.

I did both :)

pulkit accepted this revision.Feb 13 2020, 6:45 PM
This revision is now accepted and ready to land.Feb 13 2020, 6:45 PM
martinvonz added a commit: rHG088ab52a04bc: debugmergestate: make templated.Feb 13 2020, 7:26 PM
Closed by commit rHG088ab52a04bc: debugmergestate: make templated (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Feb 13 2020, 7:58 PM

I was worried that the new version might be crashing in some cases (I specifically worried about indexes out of range in the state list). To test that, I added hg debugmergestate before every hg resolve call in the test suite. That showed two different bugs. Feel free to de-queue this patch or I'll send updates later (maybe tomorrow). Sorry that I didn't think to test that before the patch got accepted.

martinvonz added a comment.Feb 14 2020, 12:14 AM
In D8113#120803, @martinvonz wrote:

I was worried that the new version might be crashing in some cases (I specifically worried about indexes out of range in the state list). To test that, I added hg debugmergestate before every hg resolve call in the test suite. That showed two different bugs. Feel free to de-queue this patch or I'll send updates later (maybe tomorrow). Sorry that I didn't think to test that before the patch got accepted.

I'll just de-queue the patch myself. I'll send a replacement for this one later.

Revision Contents
Changeset List

Diff 20209

mercurial/debugcommands.py

import subprocess import subprocess
import sys import sys
import time import time
from .i18n import _ from .i18n import _
from .node import ( from .node import (
bin, bin,
hex, hex,
nullhex,
nullid, nullid,
nullrev, nullrev,
short, short,
) )
from .pycompat import ( from .pycompat import (
getattr, getattr,
open, open,
) )
) )
ondisk = cache._opener.stat(b'manifestfulltextcache').st_size ondisk = cache._opener.stat(b'manifestfulltextcache').st_size
ui.write( ui.write(
_(b'total cache data size %s, on-disk %s\n') _(b'total cache data size %s, on-disk %s\n')
% (util.bytecount(totalsize), util.bytecount(ondisk)) % (util.bytecount(totalsize), util.bytecount(ondisk))
) )
@command(b'debugmergestate', [], b'') @command(b'debugmergestate', [] + cmdutil.templateopts, b'')
def debugmergestate(ui, repo, *args): def debugmergestate(ui, repo, *args, **opts):
"""print merge state """print merge state
Use --verbose to print out information about whether v1 or v2 merge state Use --verbose to print out information about whether v1 or v2 merge state
was chosen.""" was chosen."""
def _hashornull(h): if ui.verbose:
if h == nullhex:
return b'null'
else:
return h
def printrecords(version):
ui.writenoi18n(b'* version %d records\n' % version)
if version == 1:
records = v1records
else:
records = v2records
for rtype, record in records:
# pretty print some record types
if rtype == b'L':
ui.writenoi18n(b'local: %s\n' % record)
elif rtype == b'O':
ui.writenoi18n(b'other: %s\n' % record)
elif rtype == b'm':
driver, mdstate = record.split(b'\0', 1)
ui.writenoi18n(
b'merge driver: %s (state "%s")\n' % (driver, mdstate)
)
elif rtype in b'FDC':
r = record.split(b'\0')
f, state, hash, lfile, afile, anode, ofile = r[0:7]
if version == 1:
onode = b'not stored in v1 format'
flags = r[7]
else:
onode, flags = r[7:9]
ui.writenoi18n(
b'file: %s (record type "%s", state "%s", hash %s)\n'
% (f, rtype, state, _hashornull(hash))
)
ui.writenoi18n(
b' local path: %s (flags "%s")\n' % (lfile, flags)
)
ui.writenoi18n(
b' ancestor path: %s (node %s)\n'
% (afile, _hashornull(anode))
)
ui.writenoi18n(
b' other path: %s (node %s)\n'
% (ofile, _hashornull(onode))
)
elif rtype == b'f':
filename, rawextras = record.split(b'\0', 1)
extras = rawextras.split(b'\0')
i = 0
extrastrings = []
while i < len(extras):
extrastrings.append(b'%s = %s' % (extras[i], extras[i + 1]))
i += 2
ui.writenoi18n(
b'file extras: %s (%s)\n'
% (filename, b', '.join(extrastrings))
)
elif rtype == b'l':
labels = record.split(b'\0', 2)
labels = [l for l in labels if len(l) > 0]
ui.writenoi18n(b'labels:\n')
ui.write((b' local: %s\n' % labels[0]))
ui.write((b' other: %s\n' % labels[1]))
if len(labels) > 2:
ui.write((b' base: %s\n' % labels[2]))
else:
ui.writenoi18n(
b'unrecognized entry: %s\t%s\n'
% (rtype, record.replace(b'\0', b'\t'))
)
# Avoid mergestate.read() since it may raise an exception for unsupported
# merge state records. We shouldn't be doing this, but this is OK since this
# command is pretty low-level.
ms = mergemod.mergestate(repo) ms = mergemod.mergestate(repo)
# sort so that reasonable information is on top # sort so that reasonable information is on top
v1records = ms._readrecordsv1() v1records = ms._readrecordsv1()
v2records = ms._readrecordsv2() v2records = ms._readrecordsv2()
order = b'LOml'
def key(r):
idx = order.find(r[0])
if idx == -1:
return (1, r[1])
else:
return (0, idx)
v1records.sort(key=key)
v2records.sort(key=key)
if not v1records and not v2records: if not v1records and not v2records:
ui.writenoi18n(b'no merge state found\n') pass
elif not v2records: elif not v2records:
ui.notenoi18n(b'no version 2 merge state\n') ui.writenoi18n(b'no version 2 merge state\n')
printrecords(1)
elif ms._v1v2match(v1records, v2records): elif ms._v1v2match(v1records, v2records):
ui.notenoi18n(b'v1 and v2 states match: using v2\n') ui.writenoi18n(b'v1 and v2 states match: using v2\n')
printrecords(2)
else: else:
ui.notenoi18n(b'v1 and v2 states mismatch: using v1\n') ui.writenoi18n(b'v1 and v2 states mismatch: using v1\n')
printrecords(1)
if ui.verbose: opts = pycompat.byteskwargs(opts)
printrecords(2) if not opts[b'template']:
opts[b'template'] = (
b'{if(commits, "", "no merge state found\n")}'
b'{commits % "{name}{if(label, " ({label})")}: {node}\n"}'
b'{files % "file: {path} (state \\"{state}\\")\n'
b' local path: {local_path} (flags \\"{local_flags}\\")\n'
b' ancestor path: {ancestor_path} (node {ancestor_node})\n'
b' other path: {other_path} (node {other_node})\n'
b'{extras % " extra: {key} = {value}\n"}'
b'"}'
)
ms = mergemod.mergestate.read(repo)
fm = ui.formatter(b'debugmergestate', opts)
fm.startitem()
fm_commits = fm.nested(b'commits')
if ms.active():
for name, node, label_index in (
(b'local', ms.local, 0),
(b'other', ms.other, 1),
):
fm_commits.startitem()
fm_commits.data(name=name)
fm_commits.data(node=hex(node))
if ms._labels and len(ms._labels) > label_index:
fm_commits.data(label=ms._labels[label_index])
fm_commits.end()
fm_files = fm.nested(b'files')
if ms.active():
for f in ms:
fm_files.startitem()
fm_files.data(path=f)
state = ms._state[f]
fm_files.data(state=state[0])
fm_files.data(local_key=state[1])
fm_files.data(local_path=state[2])
fm_files.data(ancestor_path=state[3])
fm_files.data(ancestor_node=state[4])
fm_files.data(other_path=state[5])
fm_files.data(other_node=state[6])
fm_files.data(local_flags=state[7])
fm_extras = fm_files.nested(b'extras')
for k, v in ms.extras(f).items():
fm_extras.startitem()
fm_extras.data(key=k)
fm_extras.data(value=v)
fm_extras.end()
fm_files.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()
# since we previously only listed open branches, we will handle that # since we previously only listed open branches, we will handle that

relnotes/next

== New Features == == New Features ==
* `hg purge`/`hg clean` can now delete ignored files instead of * `hg purge`/`hg clean` can now delete ignored files instead of
untracked files, with the new -i flag. untracked files, with the new -i flag.
* `hg log` now defaults to using an '%' symbol for commits involved * `hg log` now defaults to using an '%' symbol for commits involved
in unresolved merge conflicts. That includes unresolved conflicts in unresolved merge conflicts. That includes unresolved conflicts
caused by e.g. `hg update --merge` and `hg graft`. '@' still takes caused by e.g. `hg update --merge` and `hg graft`. '@' still takes
precedence, so what used to be marked '@' still is. precedence, so what used to be marked '@' still is.
* New `conflictlocal()` and `conflictother()` revsets return the * New `conflictlocal()` and `conflictother()` revsets return the
commits that are being merged, when there are conflicts. Also works commits that are being merged, when there are conflicts. Also works
for conflicts caused by e.g. `hg graft`. for conflicts caused by e.g. `hg graft`.
* `hg debugmergestate` output is now templated, which may be useful
e.g. for IDEs that want to help the user resolve merge conflicts.
== New Experimental Features == == New Experimental Features ==
== Bug Fixes == == Bug Fixes ==
== Backwards Compatibility Changes == == Backwards Compatibility Changes ==
* When `hg rebase` pauses for merge conflict resolution, the working * When `hg rebase` pauses for merge conflict resolution, the working
copy will no longer have the rebased node as a second parent. You copy will no longer have the rebased node as a second parent. You
can use the new `conflictparents()` revset for finding the other can use the new `conflictparents()` revset for finding the other
parent during a conflict. parent during a conflict.
* `hg debugmergestate` output format changed. Let us know if that is
causing you problems and we'll roll it back.
== Internal API Changes == == Internal API Changes ==
* The deprecated `ui.progress()` has now been deleted. Please use * The deprecated `ui.progress()` has now been deleted. Please use
`ui.makeprogress()` instead. `ui.makeprogress()` instead.
* `hg.merge()` has lost its `abort` argument. Please call * `hg.merge()` has lost its `abort` argument. Please call
`hg.abortmerge()` directly instead. `hg.abortmerge()` directly instead.
* The `*others` argument of `cmdutil.check_incompatible_arguments()` * The `*others` argument of `cmdutil.check_incompatible_arguments()`
changed from being varargs argument to being a single collection. changed from being varargs argument to being a single collection.

tests/test-backout.t

> EOF > EOF
$ hg ci -m 'capital ten' $ hg ci -m 'capital ten'
$ hg backout -r 'desc("capital three")' --tool internal:fail $ hg backout -r 'desc("capital three")' --tool internal:fail
0 files updated, 0 files merged, 0 files removed, 1 files unresolved 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges use 'hg resolve' to retry unresolved file merges
[1] [1]
$ hg status $ hg status
$ hg debugmergestate $ hg debugmergestate
* version 2 records
local: b71750c4b0fdf719734971e3ef90dbeab5919a2d local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
other: a30dd8addae3ce71b8667868478542bc417439e6 other: a30dd8addae3ce71b8667868478542bc417439e6
file extras: foo (ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553) file: foo (state "u")
file: foo (record type "F", state "u", hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33)
local path: foo (flags "") local path: foo (flags "")
ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708) ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee) other path: foo (node f50039b486d6fa1a90ae51778388cad161f425ee)
extra: ancestorlinknode = 91360952243723bd5b1138d5f26bd8c8564cb553
$ mv .hg/merge/state2 .hg/merge/state2-moved $ mv .hg/merge/state2 .hg/merge/state2-moved
$ hg debugmergestate $ hg debugmergestate
* version 1 records
local: b71750c4b0fdf719734971e3ef90dbeab5919a2d local: b71750c4b0fdf719734971e3ef90dbeab5919a2d
file: foo (record type "F", state "u", hash 0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33) other: b71750c4b0fdf719734971e3ef90dbeab5919a2d
file: foo (state "u")
local path: foo (flags "") local path: foo (flags "")
ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708) ancestor path: foo (node f89532f44c247a0e993d63e3a734dd781ab04708)
other path: foo (node not stored in v1 format) other path: (node foo)
$ mv .hg/merge/state2-moved .hg/merge/state2 $ mv .hg/merge/state2-moved .hg/merge/state2
$ hg resolve -l # still unresolved $ hg resolve -l # still unresolved
U foo U foo
$ hg summary $ hg summary
parent: 2:b71750c4b0fd tip parent: 2:b71750c4b0fd tip
capital ten capital ten
branch: default branch: default
commit: 1 unresolved (clean) commit: 1 unresolved (clean)

tests/test-completion.t

debugindex: changelog, manifest, dir, template debugindex: changelog, manifest, dir, template
debugindexdot: changelog, manifest, dir debugindexdot: changelog, manifest, dir
debugindexstats: debugindexstats:
debuginstall: template debuginstall: template
debugknown: debugknown:
debuglabelcomplete: debuglabelcomplete:
debuglocks: force-lock, force-wlock, set-lock, set-wlock debuglocks: force-lock, force-wlock, set-lock, set-wlock
debugmanifestfulltextcache: clear, add debugmanifestfulltextcache: clear, add
debugmergestate: debugmergestate: style, template
debugnamecomplete: debugnamecomplete:
debugnodemap: dump-new, dump-disk, check, metadata debugnodemap: dump-new, dump-disk, check, metadata
debugobsolete: flags, record-parents, rev, exclusive, index, delete, date, user, template debugobsolete: flags, record-parents, rev, exclusive, index, delete, date, user, template
debugp1copies: rev debugp1copies: rev
debugp2copies: rev debugp2copies: rev
debugpathcomplete: full, normal, added, removed debugpathcomplete: full, normal, added, removed
debugpathcopies: include, exclude debugpathcopies: include, exclude
debugpeer: debugpeer:

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

merging e merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark') warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
Fix up the change (pick e860deea161a) Fix up the change (pick e860deea161a)
(hg histedit --continue to resume) (hg histedit --continue to resume)
insert unsupported advisory merge record insert unsupported advisory merge record
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate $ hg debugmergestate
* version 2 records local (local): 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758
local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 other (histedit): e860deea161a2f77de56603b340ebbb4536308ae
other: e860deea161a2f77de56603b340ebbb4536308ae file: e (state "u")
labels:
local: local
other: histedit
unrecognized entry: x advisory record
file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000)
file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f)
local path: e (flags "") local path: e (flags "")
ancestor path: e (node null) ancestor path: e (node 0000000000000000000000000000000000000000)
other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f) other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)
extra: 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
* version 2 records abort: unsupported merge state records: X
local: 8f7551c7e4a2f2efe0bc8c741baf7f227d65d758 (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
other: e860deea161a2f77de56603b340ebbb4536308ae [255]
labels:
local: local
other: histedit
file extras: e (ancestorlinknode = 0000000000000000000000000000000000000000)
file: e (record type "F", state "u", hash 58e6b3a414a1e090dfc6029add0f3555ccba127f)
local path: e (flags "")
ancestor path: e (node null)
other path: e (node 6b67ccefd5ce6de77e7ead4f5292843a0255329f)
unrecognized entry: X mandatory record
$ hg resolve -l $ hg resolve -l
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)
[255] [255]
$ hg resolve -ma $ hg resolve -ma
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)
[255] [255]

tests/test-merge-changedelete.t

M file2 M file2
M file3 M file3
C file1 C file1
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
U file3 U file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "u")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
file2: * (glob) file2: * (glob)
M file3 M file3
C file1 C file1
--- resolve --list --- --- resolve --list ---
R file1 R file1
R file2 R file2
U file3 U file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "r")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "r", hash null) file: file2 (state "r")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "u")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: 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
M file2 M file2
M file3 M file3
R file1 R file1
--- resolve --list --- --- resolve --list ---
R file1 R file1
R file2 R file2
U file3 U file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "r")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "r", hash null) file: file2 (state "r")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "u")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: 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
M file2 M file2
M file3 M file3
R file1 R file1
--- resolve --list --- --- resolve --list ---
R file1 R file1
U file2 U file2
U file3 U file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "r")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "u")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: 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
file2: * (glob) file2: * (glob)
M file3 M file3
C file1 C file1
--- resolve --list --- --- resolve --list ---
R file1 R file1
R file2 R file2
R file3 R file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "r")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "r", hash null) file: file2 (state "r")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "r")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
*** file2 does not exist *** file2 does not exist
--- file3 --- --- file3 ---
3 3
changed2 changed2
M file2 M file2
M file3 M file3
R file1 R file1
--- resolve --list --- --- resolve --list ---
R file1 R file1
R file2 R file2
R file3 R file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "r")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "r", hash null) file: file2 (state "r")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "r")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
changed1 changed1
M file2 M file2
M file3 M file3
C file1 C file1
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
U file3 U file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "u")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
M file2 M file2
M file3 M file3
C file1 C file1
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
U file3 U file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "u")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
M file2 M file2
M file3 M file3
C file1 C file1
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
U file3 U file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "u")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
M file2 M file2
M file3 M file3
C file1 C file1
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
U file3 U file3
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4 other (merge rev): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) file: file3 (state "u")
local path: file3 (flags "") local path: file3 (flags "")
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
--- status --- --- status ---
A file1 A file1
C file2 C file2
C file3 C file3
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: destination
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
--- status --- --- status ---
file2: * (glob) file2: * (glob)
A file1 A file1
C file3 C file3
--- resolve --list --- --- resolve --list ---
R file1 R file1
R file2 R file2
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "r")
labels:
local: working copy
other: destination
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "r", hash null) file: file2 (state "r")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
*** file2 does not exist *** file2 does not exist
--- file3 --- --- file3 ---
3 3
changed1 changed1
--- status --- --- status ---
file1: * (glob) file1: * (glob)
C file2 C file2
C file3 C file3
--- resolve --list --- --- resolve --list ---
R file1 R file1
R file2 R file2
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "r")
labels:
local: working copy
other: destination
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "r", hash null) file: file2 (state "r")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
*** file1 does not exist *** file1 does not exist
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
changed1 changed1
--- status --- --- status ---
A file1 A file1
C file2 C file2
C file3 C file3
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: destination
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
--- status --- --- status ---
A file1 A file1
C file2 C file2
C file3 C file3
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: destination
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3
--- status --- --- status ---
A file1 A file1
C file2 C file2
C file3 C file3
--- resolve --list --- --- resolve --list ---
U file1 U file1
U file2 U file2
--- debugmergestate --- --- debugmergestate ---
* version 2 records local (working copy): ab57bf49aa276a22d35a473592d4c34b5abc3eff
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff other (destination): 10f9a0a634e82080907e62f075ab119cbc565ea6
other: 10f9a0a634e82080907e62f075ab119cbc565ea6 file: file1 (state "u")
labels:
local: working copy
other: destination
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
other path: file1 (node null) other path: file1 (node 0000000000000000000000000000000000000000)
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
file: file2 (record type "C", state "u", hash null) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff
--- file1 --- --- file1 ---
1 1
changed changed
--- file2 --- --- file2 ---
2 2
changed changed
--- file3 --- --- file3 ---
3 3

tests/test-rebase-abort.t

warning: conflicts while merging common! (edit, then use 'hg resolve --mark') warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
Insert unsupported advisory merge record: Insert unsupported advisory merge record:
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate $ hg debugmergestate
* version 2 records local (dest): 3e046f2ecedb793b97ed32108086edd1a162f8bc
local: 3e046f2ecedb793b97ed32108086edd1a162f8bc other (source): 46f0b057b5c061d276b91491c22151f78698abd2
other: 46f0b057b5c061d276b91491c22151f78698abd2 file: common (state "u")
labels:
local: dest
other: source
unrecognized entry: x advisory record
file extras: common (ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c)
file: common (record type "F", state "u", hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1)
local path: common (flags "") local path: common (flags "")
ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6) ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5) other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
extra: 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
* version 2 records abort: unsupported merge state records: X
local: 3e046f2ecedb793b97ed32108086edd1a162f8bc (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
other: 46f0b057b5c061d276b91491c22151f78698abd2 [255]
labels:
local: dest
other: source
file extras: common (ancestorlinknode = 3163e20567cc93074fbb7a53c8b93312e59dbf2c)
file: common (record type "F", state "u", hash 94c8c21d08740f5da9eaa38d1f175c592692f0d1)
local path: common (flags "")
ancestor path: common (node de0a666fdd9c1a0b0698b90d85064d8bd34f74b6)
other path: common (node 2f6411de53677f6f1048fef5bf888d67a342e0a5)
unrecognized entry: X mandatory record
$ hg resolve -l $ hg resolve -l
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)
[255] [255]
$ hg resolve -ma $ hg resolve -ma
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)
[255] [255]

tests/test-resolve.t

$ hg resolve -q file1 $ hg resolve -q file1
$ cat file1 $ cat file1
resolved resolved
insert unsupported advisory merge record insert unsupported advisory merge record
$ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x $ hg --config extensions.fakemergerecord=$TESTDIR/fakemergerecord.py fakemergerecord -x
$ hg debugmergestate $ hg debugmergestate
* version 2 records local (working copy): 57653b9f834a4493f7240b0681efcb9ae7cab745
local: 57653b9f834a4493f7240b0681efcb9ae7cab745 other (merge rev): dc77451844e37f03f5c559e3b8529b2b48d381d1
other: dc77451844e37f03f5c559e3b8529b2b48d381d1 file: file1 (state "r")
labels:
local: working copy
other: merge rev
unrecognized entry: x advisory record
file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "") local path: file1 (flags "")
ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd) ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d) other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
file extras: file2 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac) extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
file: file2 (record type "F", state "u", hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523) file: file2 (state "u")
local path: file2 (flags "") local path: file2 (flags "")
ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd) ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d) other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac
$ hg resolve -l $ hg resolve -l
R file1 R file1
U file2 U file2
test json output
$ hg debugmergestate -T json
[
{
"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"}]
}
]
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
* version 2 records abort: unsupported merge state records: X
local: 57653b9f834a4493f7240b0681efcb9ae7cab745 (see https://mercurial-scm.org/wiki/MergeStateRecords for more information)
other: dc77451844e37f03f5c559e3b8529b2b48d381d1 [255]
labels:
local: working copy
other: merge rev
file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
file: file1 (record type "F", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
local path: file1 (flags "")
ancestor path: file1 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
other path: file1 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
file extras: file2 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac)
file: file2 (record type "F", state "u", hash cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523)
local path: file2 (flags "")
ancestor path: file2 (node 2ed2a3912a0b24502043eae84ee4b279c18b90dd)
other path: file2 (node 6f4310b00b9a147241b071a60c28a650827fb03d)
unrecognized entry: X mandatory record
$ hg resolve -l $ hg resolve -l
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)
[255] [255]
$ hg resolve -ma $ hg resolve -ma
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)
[255] [255]