Submitter | phabricator |
---|---|
Date | Feb. 14, 2018, 5:05 a.m. |
Message ID | <9aee910cde30141884f86f805a66a8cd@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/27868/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/hgext/narrow/narrowmerge.py b/hgext/narrow/narrowmerge.py --- a/hgext/narrow/narrowmerge.py +++ b/hgext/narrow/narrowmerge.py @@ -28,7 +28,9 @@ nooptypes = set(['k']) # TODO: handle with nonconflicttypes nonconflicttypes = set('a am c cm f g r e'.split()) narrowmatch = repo.narrowmatch() - for f, action in actions.items(): + # We mutate the items in the dict during iteration, so iterate + # over a copy. + for f, action in list(actions.items()): if narrowmatch(f): pass elif not branchmerge: