[Updated] [+ ] D8515: filemerge: add a hacktastic version of internal:merge3 for merge diffs
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Mon May 11 22:55:47 UTC 2020
durin42 updated this revision to Diff 21345.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8515?vs=21343&id=21345
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8515/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8515
AFFECTED FILES
mercurial/filemerge.py
CHANGE DETAILS
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -528,6 +528,19 @@
labels.append(b'base')
return _imerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels)
+ at internaltool(
+ b'merge3-lie-about-conflicts',
+ fullmerge,
+ b'',
+ precheck=_mergecheck,
+)
+def _imerge3alwaysgood(*args, **kwargs):
+ b1, junk, b2 = _imerge3(*args, **kwargs)
+ # TODO is this right? I'm not sure what these return values mean,
+ # but as far as I can tell this will indicate to callers tha the
+ # merge succeeded.
+ return b1, False, b2
+
def _imergeauto(
repo,
To: durin42, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200511/a0457018/attachment-0002.html>
More information about the Mercurial-patches
mailing list