# HG changeset patch # User Pierre-Yves David # Date 2021-07-19 01:19:06 # Node ID 4d845260a71340d678d4b218928e64c0aba33c01 # Parent aca197f5ef7d28df504a89550c85abf8a933a096 largefile: use `update_file` instead of `add` in `mergerecordupdates` This is the newer, more semantic API. Differential Revision: https://phab.mercurial-scm.org/D11196 diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -658,7 +658,7 @@ def mergerecordupdates(orig, repo, actio 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)