salvaged: explicitly skip salvaged file while encoding
This is a temporary measure to avoid diverging test cases (between commit time
sidedata and upgraded sidedata) while we implement salvaged tracking in the
different cases. This will be dropped soon.
Differential Revision: https://phab.mercurial-scm.org/D9122
--- a/mercurial/metadata.py Mon Sep 14 23:46:21 2020 +0200
+++ b/mercurial/metadata.py Wed Sep 30 12:46:49 2020 +0200
@@ -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)