[Updated] D9122: salvaged: explicitly skip salvaged file while encoding

[marmoute (Pierre-Yves David)]

Closed by commit rHG9835dde69c16: salvaged: explicitly skip salvaged file while encoding (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/D9122?vs=23010&id=23084

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, Alphare, pulkit
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20201008/35b84a7a/attachment-0002.html>