This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4665

meld: enable auto-merge
ClosedPublic

Authored by martinvonz on Sep 19 2018, 3:08 PM.

Details

Reviewers
av6
Group Reviewers
hg-reviewers
Commits
rHGf803bcb902ad: meld: enable auto-merge
Summary

This tells meld to resolve trivial conflicts before presenting the
user with the remaining conflicts.

This was attempted 5 years ago, but then --auto-merge was too new that
the patch was rejected out of concern that users still had an older
version of meld installed [1]. Maybe it's safe to assume that they
have a newer version now.

[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2013-April/050084.html

Diff Detail

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

Event Timeline

martinvonz created this revision.Sep 19 2018, 3:08 PM
av6 accepted this revision.Sep 20 2018, 7:23 AM
This revision is now accepted and ready to land.Sep 20 2018, 7:23 AM
av6 added a comment.Sep 20 2018, 7:33 AM

Although I must say that EPEL 6 (it's for RHEL/CentOS 6) still has meld 1.3.1, which may be too old for this option: https://repology.org/metapackage/meld/versions

Closed by commit rHGf803bcb902ad: meld: enable auto-merge (authored by martinvonz). · Explain WhySep 21 2018, 7:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/default.d/mergetools.rc (2 lines)

Diff 11255

mercurial/default.d/mergetools.rc

vimdiff.priority=-10 vimdiff.priority=-10
merge.check=conflicts merge.check=conflicts
merge.priority=-100 merge.priority=-100
gpyfm.gui=True gpyfm.gui=True
meld.gui=True meld.gui=True
meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output meld.args=--label=$labellocal $local --label='merged' $base --label=$labelother $other -o $output --auto-merge
meld.check=changed meld.check=changed
meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child meld.diffargs=-a --label=$plabel1 $parent --label=$clabel $child
tkdiff.args=$local $other -a $base -o $output tkdiff.args=$local $other -a $base -o $output
tkdiff.gui=True tkdiff.gui=True
tkdiff.priority=-8 tkdiff.priority=-8
tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child tkdiff.diffargs=-L $plabel1 $parent -L $clabel $child