Patchwork D11196: largefile: use `update_file` instead of `add` in `mergerecordupdates`

login
register
mail settings
Submitter phabricator
Date July 19, 2021, 3:45 p.m.
Message ID <differential-rev-PHID-DREV-rcm7bgrmf4ggwguysbov-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49510/
State Superseded
Headers show

Comments

phabricator - July 19, 2021, 3:45 p.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This is the newer, more semantic API.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D11196

AFFECTED FILES
  hgext/largefiles/overrides.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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 @@ 
                     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)