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/D11167 AFFECTED FILES hgext/largefiles/lfutil.py CHANGE DETAILS diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py --- a/hgext/largefiles/lfutil.py +++ b/hgext/largefiles/lfutil.py @@ -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': To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
