# HG changeset patch # User Yuya Nishihara # Date 1520198026 18000 # Node ID 66250de006c68b9ef9019db29b33696b3dfa3965 # Parent 723e87c8c059d102d2404646a2893cdc34cc878a py3: do not mutate dict while iterating in tagmerge diff -r 723e87c8c059 -r 66250de006c6 mercurial/tagmerge.py --- 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 -