Submitter | phabricator |
---|---|
Date | Jan. 10, 2018, 11:05 p.m. |
Message ID | <3cb07cfeeb3e44f66a77340dc8762b3b@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/26667/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -2443,7 +2443,7 @@ modified = sorted(modifiedset) added = sorted(addedset) removed = sorted(removedset) - for dst, src in copy.items(): + for dst, src in list(copy.items()): if src not in ctx1: # Files merged in during a merge and then copied/renamed are # reported as copies. We want to show them in the diff as additions.