Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefile: use `update_file` instead of `add` in `mergerecordupdates`
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 19 Jul 2021 03:19:06 +0200
changeset 47754 4d845260a713
parent 47753 aca197f5ef7d
child 47755 9e9c82d6f96f
largefile: use `update_file` instead of `add` in `mergerecordupdates` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11196
hgext/largefiles/overrides.py file | annotate | diff | comparison | revisions 
--- a/hgext/largefiles/overrides.py	Mon Jul 19 09:05:25 2021 +0200
+++ b/hgext/largefiles/overrides.py	Mon Jul 19 03:19:06 2021 +0200
@@ -658,7 +658,7 @@
                     lfile, p1_tracked=True, wc_tracked=False
                 )
                 # make sure lfile doesn't get synclfdirstate'd as normal
-                lfdirstate.add(lfile)
+                lfdirstate.update_file(lfile, p1_tracked=False, wc_tracked=True)
         lfdirstate.write()
 
     return orig(repo, actions, branchmerge, getfiledata)
mercurial