( )⚙ D12016 filemerge: always define a "base" label

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12016

filemerge: always define a "base" label
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG74973a6d4e67: filemerge: always define a "base" label
Summary

It simplifies the code and improves the conflict markers to always
have the "base" label defined.

Diff Detail

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

Event Timeline

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 5:01 AM
This revision is now accepted and ready to land.Jan 24 2022, 5:01 AM
martinvonz added a commit: rHG74973a6d4e67: filemerge: always define a "base" label.Jan 24 2022, 12:30 PM
Closed by commit rHG74973a6d4e67: filemerge: always define a "base" label (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31716

mercurial/filemerge.py

if premerge not in validkeep: if premerge not in validkeep:
_valid = b', '.join([b"'" + v + b"'" for v in validkeep]) _valid = b', '.join([b"'" + v + b"'" for v in validkeep])
raise error.ConfigError( raise error.ConfigError(
_(b"%s.premerge not valid ('%s' is neither boolean nor %s)") _(b"%s.premerge not valid ('%s' is neither boolean nor %s)")
% (tool, premerge, _valid) % (tool, premerge, _valid)
) )
if premerge: if premerge:
if len(labels) < 3:
labels.append(b'base')
mode = b'merge' mode = b'merge'
if premerge == b'keep-mergediff': if premerge == b'keep-mergediff':
mode = b'mergediff' mode = b'mergediff'
elif premerge == b'keep-merge3': elif premerge == b'keep-merge3':
mode = b'merge3' mode = b'merge3'
local = simplemerge.MergeInput(fcd, labels[0]) local = simplemerge.MergeInput(fcd, labels[0])
other = simplemerge.MergeInput(fco, labels[1]) other = simplemerge.MergeInput(fco, labels[1])
base = simplemerge.MergeInput(fca, labels[2]) base = simplemerge.MergeInput(fca, labels[2])
""" """
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in files. It will fail if there are any conflicts and leave markers in
the partially merged file. Markers will have two sections, one for each side the partially merged file. Markers will have two sections, one for each side
of merge, unless mode equals 'union' which suppresses the markers.""" of merge, unless mode equals 'union' which suppresses the markers."""
ui = repo.ui ui = repo.ui
local = simplemerge.MergeInput(fcd) local = simplemerge.MergeInput(fcd)
if len(labels) > 0:
local.label = labels[0] local.label = labels[0]
other = simplemerge.MergeInput(fco) other = simplemerge.MergeInput(fco)
if len(labels) > 1:
other.label = labels[1] other.label = labels[1]
base = simplemerge.MergeInput(fca) base = simplemerge.MergeInput(fca)
if len(labels) > 2:
base.label = labels[2] base.label = labels[2]
r = simplemerge.simplemerge(ui, local, base, other, mode=mode) r = simplemerge.simplemerge(ui, local, base, other, mode=mode)
return True, r, False return True, r, False
@internaltool( @internaltool(
b'union', b'union',
fullmerge, fullmerge,
_( _(
precheck=_mergecheck, precheck=_mergecheck,
) )
def _imerge3(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imerge3(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in files. It will fail if there are any conflicts and leave markers in
the partially merged file. Marker will have three sections, one from each the partially merged file. Marker will have three sections, one from each
side of the merge and one for the base content.""" side of the merge and one for the base content."""
if len(labels) < 3:
labels.append(b'base')
return _merge(repo, fcd, fco, fca, labels, b'merge3') return _merge(repo, fcd, fco, fca, labels, b'merge3')
@internaltool( @internaltool(
b'merge3-lie-about-conflicts', b'merge3-lie-about-conflicts',
fullmerge, fullmerge,
b'', b'',
precheck=_mergecheck, precheck=_mergecheck,
) )
def _imerge_diff(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imerge_diff(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Uses the internal non-interactive simple merge algorithm for merging Uses the internal non-interactive simple merge algorithm for merging
files. It will fail if there are any conflicts and leave markers in files. It will fail if there are any conflicts and leave markers in
the partially merged file. The marker will have two sections, one with the the partially merged file. The marker will have two sections, one with the
content from one side of the merge, and one with a diff from the base content from one side of the merge, and one with a diff from the base
content to the content on the other side. (experimental)""" content to the content on the other side. (experimental)"""
if len(labels) < 3:
labels.append(b'base')
return _merge(repo, fcd, fco, fca, labels, b'mergediff') return _merge(repo, fcd, fco, fca, labels, b'mergediff')
@internaltool(b'merge-local', mergeonly, precheck=_mergecheck) @internaltool(b'merge-local', mergeonly, precheck=_mergecheck)
def _imergelocal(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None): def _imergelocal(repo, mynode, fcd, fco, fca, toolconf, backup, labels=None):
""" """
Like :merge, but resolve all conflicts non-interactively in favor Like :merge, but resolve all conflicts non-interactively in favor
of the local `p1()` changes.""" of the local `p1()` changes."""
args = _toolstr(repo.ui, tool, b"args") args = _toolstr(repo.ui, tool, b"args")
with _maketempfiles( with _maketempfiles(
repo, fco, fca, repo.wvfs.join(backup.path()), b"$output" in args repo, fco, fca, repo.wvfs.join(backup.path()), b"$output" in args
) as temppaths: ) as temppaths:
basepath, otherpath, localoutputpath = temppaths basepath, otherpath, localoutputpath = temppaths
outpath = b"" outpath = b""
mylabel, otherlabel = labels[:2] mylabel, otherlabel = labels[:2]
if len(labels) >= 3:
baselabel = labels[2] baselabel = labels[2]
else:
baselabel = b'base'
env = { env = {
b'HG_FILE': fcd.path(), b'HG_FILE': fcd.path(),
b'HG_MY_NODE': short(mynode), b'HG_MY_NODE': short(mynode),
b'HG_OTHER_NODE': short(fco.changectx().node()), b'HG_OTHER_NODE': short(fco.changectx().node()),
b'HG_BASE_NODE': short(fca.changectx().node()), b'HG_BASE_NODE': short(fca.changectx().node()),
b'HG_MY_ISLINK': b'l' in fcd.flags(), b'HG_MY_ISLINK': b'l' in fcd.flags(),
b'HG_OTHER_ISLINK': b'l' in fco.flags(), b'HG_OTHER_ISLINK': b'l' in fco.flags(),
b'HG_BASE_ISLINK': b'l' in fca.flags(), b'HG_BASE_ISLINK': b'l' in fca.flags(),
ui, template, defaults=templatekw.keywords, resources=tres ui, template, defaults=templatekw.keywords, resources=tres
) )
pad = max(len(l) for l in labels) pad = max(len(l) for l in labels)
newlabels = [ newlabels = [
_formatlabel(cd, tmpl, labels[0], pad), _formatlabel(cd, tmpl, labels[0], pad),
_formatlabel(co, tmpl, labels[1], pad), _formatlabel(co, tmpl, labels[1], pad),
_formatlabel(ca, tmpl, labels[2], pad),
] ]
if len(labels) > 2:
newlabels.append(_formatlabel(ca, tmpl, labels[2], pad))
return newlabels return newlabels
def partextras(labels): def partextras(labels):
"""Return a dictionary of extra labels for use in prompts to the user """Return a dictionary of extra labels for use in prompts to the user
Intended use is in strings of the form "(l)ocal%(l)s". Intended use is in strings of the form "(l)ocal%(l)s".
""" """
onfailure = _(b"merging %s failed!\n") onfailure = _(b"merging %s failed!\n")
precheck = None precheck = None
isexternal = True isexternal = True
toolconf = tool, toolpath, binary, symlink, scriptfn toolconf = tool, toolpath, binary, symlink, scriptfn
if not labels: if not labels:
labels = [b'local', b'other'] labels = [b'local', b'other']
if len(labels) < 3:
labels.append(b'base')
if mergetype == nomerge: if mergetype == nomerge:
return func(repo, mynode, fcd, fco, fca, toolconf, labels) return func(repo, mynode, fcd, fco, fca, toolconf, labels)
if orig != fco.path(): if orig != fco.path():
ui.status( ui.status(
_(b"merging %s and %s to %s\n") _(b"merging %s and %s to %s\n")
% (uipathfn(orig), uipathfn(fco.path()), fduipath) % (uipathfn(orig), uipathfn(fco.path()), fduipath)
) )

tests/test-annotate.t

$ cat b $ cat b
a a
a a
a a
<<<<<<< working copy: 5fbdc1152d97 - test: b2.1 <<<<<<< working copy: 5fbdc1152d97 - test: b2.1
b4 b4
c c
b5 b5
||||||| base ||||||| base: 3086dbafde1c - test: b
======= =======
b4 b4
b5 b5
b6 b6
>>>>>>> merge rev: 37ec9f5c3d1f - test: b2 >>>>>>> merge rev: 37ec9f5c3d1f - test: b2
$ cat <<EOF > b $ cat <<EOF > b
> a > a
> a > a
$ cat qux $ cat qux
0 0
0 0
1 baz:1 1 baz:1
2 baz:2 2 baz:2
<<<<<<< working copy: 863de62655ef - test: baz:3+->3- <<<<<<< working copy: 863de62655ef - test: baz:3+->3-
3- baz:3 3- baz:3
4 baz:4 4 baz:4
||||||| base ||||||| base: 56fc739c091f - test: baz:3->3+
3+ baz:3 3+ baz:3
4 baz:4 4 baz:4
======= =======
3+ baz:3 3+ baz:3
4+ baz:4 4+ baz:4
>>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+ >>>>>>> merge rev: cb8df70ae185 - test: qux:4->4+
5 5
6 6
$ cat qux $ cat qux
0 0
0 0
1 baz:1 1 baz:1
2 baz:2 2 baz:2
<<<<<<< working copy: cb8df70ae185 - test: qux:4->4+ <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+
3+ baz:3 3+ baz:3
4+ baz:4 4+ baz:4
||||||| base ||||||| base: 56fc739c091f - test: baz:3->3+
3+ baz:3 3+ baz:3
4 baz:4 4 baz:4
======= =======
3- baz:3 3- baz:3
4 baz:4 4 baz:4
>>>>>>> merge rev: 863de62655ef - test: baz:3+->3- >>>>>>> merge rev: 863de62655ef - test: baz:3+->3-
5 5
6 6
$ hg merge 2 -q $ hg merge 2 -q
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1] [1]
$ cat a $ cat a
<<<<<<< working copy: 0a068f0261cf - test: 3 <<<<<<< working copy: 0a068f0261cf - test: 3
1 1
2 2
3 3
||||||| base ||||||| base: 1ed24be7e7a0 - test: 2
1 1
2 2
======= =======
a a
>>>>>>> merge rev: 9409851bc20a - test: a >>>>>>> merge rev: 9409851bc20a - test: a
$ cat > a << EOF $ cat > a << EOF
> b > b
> 1 > 1

tests/test-diff-change.t

--- a/file.txt Thu Jan 01 00:00:00 1970 +0000 --- a/file.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/file.txt Thu Jan 01 00:00:00 1970 +0000 +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
@@ -6,12 +6,6 @@ @@ -6,12 +6,6 @@
5 5
6 6
7 7
-<<<<<<< local: fd1f17c90d7c - test: new file -<<<<<<< local: fd1f17c90d7c - test: new file
z z
-||||||| base -||||||| base: ae119d680c82 - test: lots of text
-8 -8
-======= -=======
-y -y
->>>>>>> other: d9e7de69eac3 - test: new file ->>>>>>> other: d9e7de69eac3 - test: new file
9 9
10 10
There must _NOT_ be a .hg/merge directory leftover. There must _NOT_ be a .hg/merge directory leftover.
$ test ! -d .hg/merge $ test ! -d .hg/merge
(No output is expected) (No output is expected)
$ cd .. $ cd ..

tests/test-fastannotate-hg.t

$ cat b $ cat b
a a
a a
a a
<<<<<<< working copy: 5fbdc1152d97 - test: b2.1 <<<<<<< working copy: 5fbdc1152d97 - test: b2.1
b4 b4
c c
b5 b5
||||||| base ||||||| base: 3086dbafde1c - test: b
======= =======
b4 b4
b5 b5
b6 b6
>>>>>>> merge rev: 37ec9f5c3d1f - test: b2 >>>>>>> merge rev: 37ec9f5c3d1f - test: b2
$ cat <<EOF > b $ cat <<EOF > b
> a > a
> a > a
$ hg merge 2 -q $ hg merge 2 -q
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1] [1]
$ cat a $ cat a
<<<<<<< working copy: 0a068f0261cf - test: 3 <<<<<<< working copy: 0a068f0261cf - test: 3
1 1
2 2
3 3
||||||| base ||||||| base: 1ed24be7e7a0 - test: 2
1 1
2 2
======= =======
a a
>>>>>>> merge rev: 9409851bc20a - test: a >>>>>>> merge rev: 9409851bc20a - test: a
$ cat > a << EOF $ cat > a << EOF
> b > b
> 1 > 1

tests/test-merge-changedelete.t

changed changed
--- 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
||||||| base ||||||| base: ab57bf49aa27 - test: added files
======= =======
changed1 changed1
>>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan...
Exercise transitions between local, other, fail and prompt, and make sure the Exercise transitions between local, other, fail and prompt, and make sure the
dirstate stays consistent. (Compare with each other and to the above dirstate stays consistent. (Compare with each other and to the above
invocations.) invocations.)

tests/test-merge-force.t

content2 content2
M content1_content2_content1_content2-untracked M content1_content2_content1_content2-untracked
content2 content2
M content1_content2_content1_content4-tracked M content1_content2_content1_content4-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content4 content4
||||||| base ||||||| base: 8ef80617fa20 - test: base
content1 content1
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M content1_content2_content1_content4-untracked M content1_content2_content1_content4-untracked
content2 content2
content2 content2
M content1_content2_content2_content2-untracked M content1_content2_content2_content2-untracked
content2 content2
M content1_content2_content2_content4-tracked M content1_content2_content2_content4-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content4 content4
||||||| base ||||||| base: 8ef80617fa20 - test: base
content1 content1
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M content1_content2_content2_content4-untracked M content1_content2_content2_content4-untracked
content2 content2
content2 content2
M content1_content2_content3_content2-untracked M content1_content2_content3_content2-untracked
content2 content2
M content1_content2_content3_content3-tracked M content1_content2_content3_content3-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content3 content3
||||||| base ||||||| base: 8ef80617fa20 - test: base
content1 content1
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M content1_content2_content3_content3-untracked M content1_content2_content3_content3-untracked
content2 content2
M content1_content2_content3_content4-tracked M content1_content2_content3_content4-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content4 content4
||||||| base ||||||| base: 8ef80617fa20 - test: base
content1 content1
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M content1_content2_content3_content4-untracked M content1_content2_content3_content4-untracked
content2 content2
content2 content2
M content1_content2_missing_content2-untracked M content1_content2_missing_content2-untracked
content2 content2
M content1_content2_missing_content4-tracked M content1_content2_missing_content4-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content4 content4
||||||| base ||||||| base: 8ef80617fa20 - test: base
content1 content1
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M content1_content2_missing_content4-untracked M content1_content2_missing_content4-untracked
content2 content2
content2 content2
M missing_content2_content2_content2-untracked M missing_content2_content2_content2-untracked
content2 content2
M missing_content2_content2_content4-tracked M missing_content2_content2_content4-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content4 content4
||||||| base ||||||| base: 000000000000 - :
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M missing_content2_content2_content4-untracked M missing_content2_content2_content4-untracked
content2 content2
M missing_content2_content2_missing-tracked M missing_content2_content2_missing-tracked
content2 content2
M missing_content2_content2_missing-untracked M missing_content2_content2_missing-untracked
content2 content2
M missing_content2_content3_content2-tracked M missing_content2_content3_content2-tracked
content2 content2
M missing_content2_content3_content2-untracked M missing_content2_content3_content2-untracked
content2 content2
M missing_content2_content3_content3-tracked M missing_content2_content3_content3-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content3 content3
||||||| base ||||||| base: 000000000000 - :
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M missing_content2_content3_content3-untracked M missing_content2_content3_content3-untracked
content2 content2
M missing_content2_content3_content4-tracked M missing_content2_content3_content4-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content4 content4
||||||| base ||||||| base: 000000000000 - :
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M missing_content2_content3_content4-untracked M missing_content2_content3_content4-untracked
content2 content2
M missing_content2_content3_missing-tracked M missing_content2_content3_missing-tracked
content2 content2
M missing_content2_content3_missing-untracked M missing_content2_content3_missing-untracked
content2 content2
M missing_content2_missing_content2-tracked M missing_content2_missing_content2-tracked
content2 content2
M missing_content2_missing_content2-untracked M missing_content2_missing_content2-untracked
content2 content2
M missing_content2_missing_content4-tracked M missing_content2_missing_content4-tracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content4 content4
||||||| base ||||||| base: 000000000000 - :
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M missing_content2_missing_content4-untracked M missing_content2_missing_content4-untracked
<<<<<<< working copy: 0447570f1af6 - test: local <<<<<<< working copy: 0447570f1af6 - test: local
content4 content4
||||||| base ||||||| base: 000000000000 - :
======= =======
content2 content2
>>>>>>> merge rev: 85100b8c675b - test: remote >>>>>>> merge rev: 85100b8c675b - test: remote
M missing_content2_missing_missing-tracked M missing_content2_missing_missing-tracked
content2 content2
M missing_content2_missing_missing-untracked M missing_content2_missing_missing-untracked

tests/test-merge-tools.t

true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3 $ hg merge -r 4 --config merge-tools.true.premerge=keep-merge3
merging f merging f
<<<<<<< working copy: ef83787e2614 - test: revision 1 <<<<<<< working copy: ef83787e2614 - test: revision 1
revision 1 revision 1
space space
||||||| base ||||||| base: ffd2bda21d6e - test: revision 0
revision 0 revision 0
space space
======= =======
revision 4 revision 4
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4
revision 0 revision 0
space space
revision 4 revision 4
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ aftermerge $ aftermerge
# cat f # cat f
<<<<<<< working copy: ef83787e2614 - test: revision 1 <<<<<<< working copy: ef83787e2614 - test: revision 1
revision 1 revision 1
space space
||||||| base ||||||| base: ffd2bda21d6e - test: revision 0
revision 0 revision 0
space space
======= =======
revision 4 revision 4
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4 >>>>>>> merge rev: 81448d39c9a0 - test: revision 4
# hg stat # hg stat
M f M f
# hg resolve --list # hg resolve --list
R f R f
premerge=keep-mergediff keeps conflict markers with base content: premerge=keep-mergediff keeps conflict markers with base content:
$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
# hg update -C 1 # hg update -C 1
$ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff $ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff
merging f merging f
<<<<<<< <<<<<<<
------- base ------- base: ffd2bda21d6e - test: revision 0
+++++++ working copy: ef83787e2614 - test: revision 1 +++++++ working copy: ef83787e2614 - test: revision 1
-revision 0 -revision 0
+revision 1 +revision 1
space space
======= merge rev: 81448d39c9a0 - test: revision 4 ======= merge rev: 81448d39c9a0 - test: revision 4
revision 4 revision 4
>>>>>>> >>>>>>>
revision 0 revision 0
space space
revision 4 revision 4
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ aftermerge $ aftermerge
# cat f # cat f
<<<<<<< <<<<<<<
------- base ------- base: ffd2bda21d6e - test: revision 0
+++++++ working copy: ef83787e2614 - test: revision 1 +++++++ working copy: ef83787e2614 - test: revision 1
-revision 0 -revision 0
+revision 1 +revision 1
space space
======= merge rev: 81448d39c9a0 - test: revision 4 ======= merge rev: 81448d39c9a0 - test: revision 4
revision 4 revision 4
>>>>>>> >>>>>>>
# hg stat # hg stat

tests/test-rebase-collapse.t

| | | |
% | 1: f899f3910ce7 'B' % | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ cat A $ cat A
<<<<<<< dest: 82b8abf9c185 D - test: D <<<<<<< dest: 82b8abf9c185 D - test: D
D D
||||||| base ||||||| base: 4a2df7238c3b A - test: A
A A
======= =======
B B
>>>>>>> source: f899f3910ce7 B - test: B >>>>>>> source: f899f3910ce7 B - test: B
$ echo BC > A $ echo BC > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
| | | |
o | 1: f899f3910ce7 'B' o | 1: f899f3910ce7 'B'
|/ |/
o 0: 4a2df7238c3b 'A' o 0: 4a2df7238c3b 'A'
$ cat A $ cat A
<<<<<<< dest: 82b8abf9c185 D - test: D <<<<<<< dest: 82b8abf9c185 D - test: D
BC BC
||||||| base ||||||| base: f899f3910ce7 B - test: B
B B
======= =======
C C
>>>>>>> source: 63668d570d21 C tip - test: C >>>>>>> source: 63668d570d21 C tip - test: C
$ echo BD > A $ echo BD > A
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue

tests/test-rebase-conflicts.t

$ hg diff $ hg diff
diff -r 328e4ab1f7cc a diff -r 328e4ab1f7cc a
--- a/a Thu Jan 01 00:00:00 1970 +0000 --- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a * (glob) +++ b/a * (glob)
@@ -1,2 +1,8 @@ @@ -1,2 +1,8 @@
a a
+<<<<<<< dest: 328e4ab1f7cc ab - test: ab +<<<<<<< dest: 328e4ab1f7cc ab - test: ab
b b
+||||||| base +||||||| base: cb9a9f314b8b - test: a
+======= +=======
+b +b
+c +c
+>>>>>>> source: 7bc217434fc1 - test: abc +>>>>>>> source: 7bc217434fc1 - test: abc
Test rebase with obsstore turned on and off (issue5606) Test rebase with obsstore turned on and off (issue5606)
$ cd $TESTTMP $ cd $TESTTMP

tests/test-update-branches.t

# a # a
# #
# To mark files as resolved: hg resolve --mark FILE # To mark files as resolved: hg resolve --mark FILE
$ cat a $ cat a
<<<<<<< working copy: 6efa171f091b - test: 3 <<<<<<< working copy: 6efa171f091b - test: 3
three three
dirty dirty
||||||| base ||||||| base: 6efa171f091b - test: 3
three three
======= =======
four four
>>>>>>> destination: d047485b3896 b1 - test: 4 >>>>>>> destination: d047485b3896 b1 - test: 4
$ rm a.orig $ rm a.orig
$ echo 'update.check = noconflict' >> .hg/hgrc $ echo 'update.check = noconflict' >> .hg/hgrc