Mercurial > hg
diff mercurial/tagmerge.py @ 36733:66250de006c6
py3: do not mutate dict while iterating in tagmerge
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 04 Mar 2018 16:13:46 -0500 |
parents | d1aa3fee4ca4 |
children | b77ff4fbe9ad |
line wrap: on
line diff
--- a/mercurial/tagmerge.py Sun Mar 04 16:01:18 2018 -0500 +++ b/mercurial/tagmerge.py Sun Mar 04 16:13:46 2018 -0500 @@ -146,7 +146,7 @@ possible to the first parent's .hgtags file. ''' # group the node-tag pairs that must be written next to each other - for tname, taglist in mergedtags.items(): + for tname, taglist in list(mergedtags.items()): mergedtags[tname] = grouptagnodesbyline(taglist) # convert the grouped merged tags dict into a format that resembles the @@ -269,4 +269,3 @@ writemergedtags(fcd, mergedtags) ui.note(_('.hgtags merged successfully\n')) return False, 0 -