# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2021-07-19 01:20:04
# Node ID 9fa1085fbd63af8387dd9011d45252a5732c7612
# Parent  c9e412712e0c4d4161d74eda81fc58d68ff776b4

largefile: use `update_file` instead of `remove` in `mergerecordupdates`

This is the newer, more semantic API.

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

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -654,7 +654,9 @@ def mergerecordupdates(orig, repo, actio
             ]:
                 # this should be executed before 'orig', to execute 'remove'
                 # before all other actions
-                repo.dirstate.remove(lfile)
+                repo.dirstate.update_file(
+                    lfile, p1_tracked=True, wc_tracked=False
+                )
                 # make sure lfile doesn't get synclfdirstate'd as normal
                 lfdirstate.add(lfile)
         lfdirstate.write()