[Updated] D11192: largefile: use `update_file` instead of `drop` during `rollback`
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Tue Jul 20 20:42:30 UTC 2021
Closed by commit rHG13e2ce796dcd: largefile: use `update_file` instead of `drop` during `rollback` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11192?vs=29585&id=29693
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11192/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11192
AFFECTED FILES
hgext/largefiles/overrides.py
CHANGE DETAILS
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -1640,7 +1640,9 @@
lfutil.synclfdirstate(repo, lfdirstate, file, True)
orphans.discard(file)
for lfile in orphans:
- lfdirstate.drop(lfile)
+ lfdirstate.update_file(
+ lfile, p1_tracked=False, wc_tracked=False
+ )
lfdirstate.write()
return result
To: marmoute, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210720/bcb69229/attachment-0002.html>
More information about the Mercurial-patches
mailing list