# HG changeset patch # User Pierre-Yves David # Date 1393297204 28800 # Node ID 81a3d9a24e6b9ad05fc5bb73dc28b0f1c8513e37 # Parent 4dd1cda16fd0981d9d6380240ef4dff4cf34487e evolve: fix creation of prunedchildren for merge The `p2` code path was broken. (stupid typo) diff -r 4dd1cda16fd0 -r 81a3d9a24e6b hgext/evolve.py --- a/hgext/evolve.py Thu Feb 20 13:59:49 2014 -0800 +++ b/hgext/evolve.py Mon Feb 24 19:00:04 2014 -0800 @@ -344,7 +344,7 @@ p1 = node.bin(meta['p1']) self.prunedchildren.setdefault(p1, set()).add(m) if 'p2' in meta: - p1 = node.bin(meta['p2']) + p2 = node.bin(meta['p2']) self.prunedchildren.setdefault(p2, set()).add(m) yield m