Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/largefiles/lfutil.py
changeset 47725 1f3a87a7a9b1
parent 47724 b0a39b666e2d
child 47749 068e09499d4e 
--- 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':
mercurial