This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12378

tests: demonstrate how conflict markers end up $local *and* $output
ClosedPublic

Authored by martinvonz on Mar 15 2022, 4:52 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGb10a944c0486: tests: demonstrate how conflict markers end up $local *and* $output
Summary

When a merge tool is configured to keep conflict markers, they are
supposed to be written to $local if $output is not mentioned in
the tool's merge-tools.<tool>.args config, and in $output if it is
mentioned. However, I broke the latter case in D12190.

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mtests/test-merge-tools.t (40 lines)

Diff 32653

tests/test-merge-tools.t

======= =======
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
with premerge=keep and $output in tool args, $local does not have markers:
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
# hg update -C 1
$ hg merge -r 4 --config merge-tools.true.premerge=keep --config 'merge-tools.true.args=$base $local $other $output'
merging f
revision 0
space
<<<<<<< working copy: ef83787e2614 - test: revision 1 (known-bad-output !)
revision 1
space
======= (known-bad-output !)
revision 4 (known-bad-output !)
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4 (known-bad-output !)
revision 4
<<<<<<< working copy: ef83787e2614 - test: revision 1
revision 1
space
=======
revision 4
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ aftermerge
# cat f
<<<<<<< working copy: ef83787e2614 - test: revision 1
revision 1
space
=======
revision 4
>>>>>>> merge rev: 81448d39c9a0 - test: revision 4
# hg stat
M f
# hg resolve --list
R f
premerge=keep-merge3 keeps conflict markers with base content: premerge=keep-merge3 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