# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 2020-07-25 09:11:20
# Node ID ab57793dec5b765cbff11074e0827a6f40cb3896
# Parent  cb0cd87e16b45c6a6b4539641d45dcc0f9b2941a

largefiles: override merge.emptyactions() to include `lfmr`

I found it weird that we were not already doing this. I encountered this while
using `emptyactions()` in mergeresult() class.

Differential Revision: https://phab.mercurial-scm.org/D8835

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 @@ def overridedebugstate(orig, ui, repo, *
         orig(ui, repo, *pats, **opts)
 
 
+# Register the `lfmr` merge action in emptyactions() return type
+@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.