# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2021-07-18 22:04:24
# Node ID 7d2f0e14da4ccc794f7fa6fb37163e95c640a9e8
# Parent  0149d17da91be97bec3d109e25a0f70d750a4e83

largefile: use `update_file` instead of `normal`

This is the newer, more semantic API.

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

diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -1805,7 +1805,7 @@ def mergeupdate(orig, repo, node, branch
             # to avoid leaving all largefiles as dirty and thus rehash them, mark
             # all the ones that didn't change as clean
             for lfile in oldclean.difference(filelist):
-                lfdirstate.normal(lfile)
+                lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
             lfdirstate.write()
 
             if branchmerge or force or partial: