Submitter | phabricator |
---|---|
Date | July 19, 2021, 2:09 p.m. |
Message ID | <differential-rev-PHID-DREV-g6rlu2jdc34vq7nrtxfx-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/49481/ |
State | Superseded |
Headers | show |
Comments
Patch
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':