changeset 45660 | e66db30f95a8 |
parent 45659 | a475db79d84d |
child 45663 | cf474af69766 |
--- 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)