Mercurial > evolve

changeset 808:81a3d9a24e6b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: fix creation of prunedchildren for merge The `p2` code path was broken. (stupid typo)
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 24 Feb 2014 19:00:04 -0800
parents 4dd1cda16fd0
children 5d3ddede6ccf
files hgext/evolve.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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