changeset 33942 | 54c21114e41d |
parent 33941 | c0bbaefc2c5a |
child 33993 | 3d0f8918351b |
--- a/mercurial/obsutil.py Mon Jul 03 03:54:24 2017 +0200 +++ b/mercurial/obsutil.py Mon Jul 03 03:56:53 2017 +0200 @@ -562,9 +562,9 @@ # remove duplicated and subset seen = [] final = [] - candidate = sorted((s for s in succssets if s), - key=len, reverse=True) - for cand in candidate: + candidates = sorted((s for s in succssets if s), + key=len, reverse=True) + for cand in candidates: for seensuccs in seen: if cand.canmerge(seensuccs): seensuccs.markers.update(cand.markers)