Mercurial > hg-stable

changeset 47725:1f3a87a7a9b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefile: use `update_file` for `synclfdirstate` "m" case This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11167
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 19 Jul 2021 05:47:54 +0200
parents b0a39b666e2d
children 8e2e8d0a9a56
files hgext/largefiles/lfutil.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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':