# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1626666474 -7200
# Node ID 1f3a87a7a9b11bd91c67fae6d8cf62fd91e634e4
# Parent  b0a39b666e2d2df2d35aa7766f96bc3e14652e31
largefile: use `update_file` for `synclfdirstate` "m" case

This is the newer, more semantic API.

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

diff -r b0a39b666e2d -r 1f3a87a7a9b1 hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py	Mon Jul 19 05:47:33 2021 +0200
+++ b/hgext/largefiles/lfutil.py	Mon Jul 19 05:47:54 2021 +0200
@@ -569,7 +569,9 @@
             else:
                 lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=True)
         elif state == b'm':
-            lfdirstate.normallookup(lfile)
+            lfdirstate.update_file(
+                lfile, p1_tracked=True, wc_tracked=True, merged=True
+            )
         elif state == b'r':
             lfdirstate.update_file(lfile, p1_tracked=True, wc_tracked=False)
         elif state == b'a':