| durin42 |
| hg-reviewers |
| No Linters Available |
| No Unit Test Coverage |
Making this patch part of D8113 (this patch was never meant to be queued on its own).
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/debugcommands.py (207 lines) | |||
| M | tests/test-backout.t (11 lines) | |||
| M | tests/test-completion.t (4 lines) | |||
| M | tests/test-help.t (2 lines) | |||
| M | tests/test-histedit-non-commute-abort.t (30 lines) | |||
| M | tests/test-merge-changedelete.t (404 lines) | |||
| M | tests/test-rebase-abort.t (28 lines) | |||
| M | tests/test-resolve.t (52 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 785e0c5045a0 | 089063037d1d | Martin von Zweigbergk | Feb 13 2020, 2:06 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Abandoned | martinvonz | ||
| Closed | martinvonz |
| ) | ) | ||||
| 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: | |||||
| printrecords(2) | |||||
| @command(b'debugmergestatetemplated', [] + cmdutil.templateopts, b'') | |||||
| def debugmergestatetemplated(ui, repo, *args, **opts): | |||||
| """templated output about the merge state | |||||
| This command requires a template (such as '-T json'). | |||||
| """ | |||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| if not opts[b'template']: | if not opts[b'template']: | ||||
| raise error.Abort(_(b'template required')) | 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) | ms = mergemod.mergestate.read(repo) | ||||
| if not ms.active(): | |||||
| return | |||||
| fm = ui.formatter(b'debugmergestatetemplated', opts) | fm = ui.formatter(b'debugmergestate', opts) | ||||
| fm.startitem() | fm.startitem() | ||||
| fm_commits = fm.nested(b'commits') | fm_commits = fm.nested(b'commits') | ||||
| if ms.active(): | |||||
| for name, node, label_index in ( | for name, node, label_index in ( | ||||
| (b'local', ms.local, 0), | (b'local', ms.local, 0), | ||||
| (b'other', ms.other, 1), | (b'other', ms.other, 1), | ||||
| ): | ): | ||||
| fm_commits.startitem() | fm_commits.startitem() | ||||
| fm_commits.data(name=name) | fm_commits.data(name=name) | ||||
| fm_commits.data(node=hex(node)) | fm_commits.data(node=hex(node)) | ||||
| if ms._labels and len(ms._labels) > label_index: | if ms._labels and len(ms._labels) > label_index: | ||||
| fm_commits.data(label=ms._labels[label_index]) | fm_commits.data(label=ms._labels[label_index]) | ||||
| fm_commits.end() | fm_commits.end() | ||||
| fm_files = fm.nested(b'files') | fm_files = fm.nested(b'files') | ||||
| if ms.active(): | |||||
| for f in ms: | for f in ms: | ||||
| fm_files.startitem() | fm_files.startitem() | ||||
| fm_files.data(name=f) | fm_files.data(path=f) | ||||
| state = ms._state[f] | state = ms._state[f] | ||||
| fm_files.data(state=state[0]) | fm_files.data(state=state[0]) | ||||
| if state[0] == mergemod.MERGE_RECORD_UNRESOLVED: | if state[0] == mergemod.MERGE_RECORD_UNRESOLVED: | ||||
| fm_files.data(local_key=state[1]) | fm_files.data(local_key=state[1]) | ||||
| fm_files.data(local_path=state[2]) | fm_files.data(local_path=state[2]) | ||||
| fm_files.data(ancestor_path=state[3]) | fm_files.data(ancestor_path=state[3]) | ||||
| fm_files.data(ancestor_node=state[4]) | fm_files.data(ancestor_node=state[4]) | ||||
| fm_files.data(other_path=state[5]) | fm_files.data(other_path=state[5]) | ||||
| 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]) | ||||
| fm_extras = fm_files.nested(b'extras') | fm_extras = fm_files.nested(b'extras') | ||||
| for k, v in ms.extras(f).items(): | for k, v in ms.extras(f).items(): | ||||
| fm_extras.startitem() | fm_extras.startitem() | ||||
| 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_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): | ||||
| > 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) | ||||
| debugindexdot | debugindexdot | ||||
| debugindexstats | debugindexstats | ||||
| debuginstall | debuginstall | ||||
| debugknown | debugknown | ||||
| debuglabelcomplete | debuglabelcomplete | ||||
| debuglocks | debuglocks | ||||
| debugmanifestfulltextcache | debugmanifestfulltextcache | ||||
| debugmergestate | debugmergestate | ||||
| debugmergestatetemplated | |||||
| debugnamecomplete | debugnamecomplete | ||||
| debugnodemap | debugnodemap | ||||
| debugobsolete | debugobsolete | ||||
| debugp1copies | debugp1copies | ||||
| debugp2copies | debugp2copies | ||||
| debugpathcomplete | debugpathcomplete | ||||
| debugpathcopies | debugpathcopies | ||||
| debugpeer | debugpeer | ||||
| 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 | ||||
| debugmergestatetemplated: 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: | ||||
| debuginstall test Mercurial installation | debuginstall test Mercurial installation | ||||
| debugknown test whether node ids are known to a repo | debugknown test whether node ids are known to a repo | ||||
| debuglocks show or modify state of locks | debuglocks show or modify state of locks | ||||
| debugmanifestfulltextcache | debugmanifestfulltextcache | ||||
| show, clear or amend the contents of the manifest fulltext | show, clear or amend the contents of the manifest fulltext | ||||
| cache | cache | ||||
| debugmergestate | debugmergestate | ||||
| print merge state | print merge state | ||||
| debugmergestatetemplated | |||||
| templated output about the merge state | |||||
| debugnamecomplete | debugnamecomplete | ||||
| complete "names" - tags, open branch names, bookmark names | complete "names" - tags, open branch names, bookmark names | ||||
| debugnodemap write and inspect on disk nodemap | debugnodemap write and inspect on disk nodemap | ||||
| debugobsolete | debugobsolete | ||||
| create arbitrary obsolete marker | create arbitrary obsolete marker | ||||
| debugoptADV (no help text available) | debugoptADV (no help text available) | ||||
| debugoptDEP (no help text available) | debugoptDEP (no help text available) | ||||
| debugoptEXP (no help text available) | debugoptEXP (no help text available) | ||||
| 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] | ||||
| 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 path: (flags "") | ||||
| local: working copy | ancestor path: (node ) | ||||
| other: merge rev | other path: (node ) | ||||
| file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) | file: file2 (state "r") | ||||
| local path: file1 (flags "") | local path: (flags "") | ||||
| ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | ancestor path: (node ) | ||||
| other path: file1 (node null) | other path: (node ) | ||||
| file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file2 (record type "C", state "r", hash null) | file: file3 (state "u") | ||||
| local path: file2 (flags "") | |||||
| ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |||||
| other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |||||
| file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | |||||
| file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) | |||||
| 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 path: (flags "") | ||||
| local: working copy | ancestor path: (node ) | ||||
| other: merge rev | other path: (node ) | ||||
| file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) | file: file2 (state "r") | ||||
| local path: file1 (flags "") | local path: (flags "") | ||||
| ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | ancestor path: (node ) | ||||
| other path: file1 (node null) | other path: (node ) | ||||
| file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file2 (record type "C", state "r", hash null) | file: file3 (state "u") | ||||
| local path: file2 (flags "") | |||||
| ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |||||
| other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |||||
| file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | |||||
| file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) | |||||
| 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 path: (flags "") | ||||
| local: working copy | ancestor path: (node ) | ||||
| other: merge rev | other path: (node ) | ||||
| file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) | file: file2 (state "u") | ||||
| local path: file1 (flags "") | |||||
| ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | |||||
| other path: file1 (node null) | |||||
| file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | |||||
| file: file2 (record type "C", state "u", hash null) | |||||
| 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 path: (flags "") | ||||
| local: working copy | ancestor path: (node ) | ||||
| other: merge rev | other path: (node ) | ||||
| file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) | file: file2 (state "r") | ||||
| local path: file1 (flags "") | local path: (flags "") | ||||
| ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | ancestor path: (node ) | ||||
| other path: file1 (node null) | other path: (node ) | ||||
| file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file2 (record type "C", state "r", hash null) | file: file3 (state "r") | ||||
| local path: file2 (flags "") | local path: (flags "") | ||||
| ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | ancestor path: (node ) | ||||
| other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | other path: (node ) | ||||
| file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) | |||||
| local path: file3 (flags "") | |||||
| ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | |||||
| other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | |||||
| --- 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 path: (flags "") | ||||
| local: working copy | ancestor path: (node ) | ||||
| other: merge rev | other path: (node ) | ||||
| file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) | file: file2 (state "r") | ||||
| local path: file1 (flags "") | local path: (flags "") | ||||
| ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | ancestor path: (node ) | ||||
| other path: file1 (node null) | other path: (node ) | ||||
| file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file2 (record type "C", state "r", hash null) | file: file3 (state "r") | ||||
| local path: file2 (flags "") | local path: (flags "") | ||||
| ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | ancestor path: (node ) | ||||
| other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | other path: (node ) | ||||
| file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11) | |||||
| local path: file3 (flags "") | |||||
| ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | |||||
| other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | |||||
| *** 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 path: (flags "") | ||||
| local: working copy | ancestor path: (node ) | ||||
| other: destination | other path: (node ) | ||||
| file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) | file: file2 (state "r") | ||||
| local path: file1 (flags "") | local path: (flags "") | ||||
| ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | ancestor path: (node ) | ||||
| other path: file1 (node null) | other path: (node ) | ||||
| file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file2 (record type "C", state "r", hash null) | |||||
| local path: file2 (flags "") | |||||
| ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |||||
| other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |||||
| --- 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 path: (flags "") | ||||
| local: working copy | ancestor path: (node ) | ||||
| other: destination | other path: (node ) | ||||
| file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390) | file: file2 (state "r") | ||||
| local path: file1 (flags "") | local path: (flags "") | ||||
| ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | ancestor path: (node ) | ||||
| other path: file1 (node null) | other path: (node ) | ||||
| file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff) | extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | ||||
| file: file2 (record type "C", state "r", hash null) | |||||
| local path: file2 (flags "") | |||||
| ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | |||||
| other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | |||||
| *** 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 | ||||
| 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] | ||||
| $ 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 path: (flags "") | ||||
| local: working copy | ancestor path: (node ) | ||||
| other: merge rev | other path: (node ) | ||||
| unrecognized entry: x advisory record | extra: ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac | ||||
| file extras: file1 (ancestorlinknode = 99726c03216e233810a2564cbc0adfe395007eac) | file: file2 (state "u") | ||||
| 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 "") | 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 debugmergestatetemplate | test json output | ||||
| $ hg debugmergestatetemplated | $ hg debugmergestate -T json | ||||
| abort: template required | |||||
| [255] | |||||
| $ hg debugmergestatetemplated -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": [{"extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "name": "file1", "state": "r"}, {"ancestor_node": "2ed2a3912a0b24502043eae84ee4b279c18b90dd", "ancestor_path": "file2", "extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "local_flags": "", "local_key": "cb99b709a1978bd205ab9dfd4c5aaa1fc91c7523", "local_path": "file2", "name": "file2", "other_node": "6f4310b00b9a147241b071a60c28a650827fb03d", "other_path": "file2", "state": "u"}] | "files": [{"extras": [{"key": "ancestorlinknode", "value": "99726c03216e233810a2564cbc0adfe395007eac"}], "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] | ||||