[Updated] D8835: largefiles: override merge.emptyactions() to include `lfmr`
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sun Aug 2 17:47:08 UTC 2020
Closed by commit rHGab57793dec5b: largefiles: override merge.emptyactions() to include `lfmr` (authored by pulkit).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8835?vs=22122&id=22218
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8835/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8835
AFFECTED FILES
hgext/largefiles/overrides.py
CHANGE DETAILS
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -495,6 +495,14 @@
orig(ui, repo, *pats, **opts)
+# Register the `lfmr` merge action in emptyactions() return type
+ at eh.wrapfunction(merge, b'emptyactions')
+def overrideemptyactions(origfn):
+ ret = origfn()
+ ret[b'lfmr'] = []
+ return ret
+
+
# Before starting the manifest merge, merge.updates will call
# _checkunknownfile to check if there are any files in the merged-in
# changeset that collide with unknown files in the working copy.
To: pulkit, #hg-reviewers, indygreg
Cc: indygreg, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200802/8ed3fd4f/attachment-0002.html>
More information about the Mercurial-patches
mailing list