Submitter | phabricator |
---|---|
Date | Sept. 30, 2020, 1:10 p.m. |
Message ID | <differential-rev-PHID-DREV-sadwppsuyzqnklw6kgpu-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47339/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/metadata.py b/mercurial/metadata.py --- a/mercurial/metadata.py +++ b/mercurial/metadata.py @@ -423,10 +423,11 @@ added = files.added removed = files.removed merged = files.merged + salvaged = files.salvaged copied_from_p1 = files.copied_from_p1 copied_from_p2 = files.copied_from_p2 - all_files = set(touched) + all_files = set(touched - salvaged) all_files.update(copied_from_p1.values()) all_files.update(copied_from_p2.values()) all_files = sorted(all_files)