[Updated] [+ ] D9122: salvaged: explicitly skip salvaged file while encoding
marmoute (Pierre-Yves David)
phabricator at mercurial-scm.org
Fri Oct 2 09:09:11 UTC 2020
marmoute updated this revision to Diff 22991.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D9122?vs=22983&id=22991
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D9122/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D9122
AFFECTED FILES
mercurial/metadata.py
CHANGE DETAILS
diff --git a/mercurial/metadata.py b/mercurial/metadata.py
--- a/mercurial/metadata.py
+++ b/mercurial/metadata.py
@@ -418,7 +418,7 @@
def encode_files_sidedata(files):
- all_files = set(files.touched)
+ all_files = set(files.touched - files.salvaged)
all_files.update(files.copied_from_p1.values())
all_files.update(files.copied_from_p2.values())
all_files = sorted(all_files)
To: marmoute, #hg-reviewers
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20201002/55258dc9/attachment-0002.html>
More information about the Mercurial-patches
mailing list