hgext/evolve.py
branchstable
changeset 1311 d6a740947197
parent 1310 f032d93506d8
child 1313 31e96036acd3
child 1330 efb75f4d55aa
--- a/hgext/evolve.py	Mon May 04 10:46:06 2015 -0700
+++ b/hgext/evolve.py	Mon May 04 10:47:02 2015 -0700
@@ -981,11 +981,10 @@
                 rev = nm.get(mark[0])
                 if rev is not None:
                     ctx = unfi[rev]
-                    meta = obsolete.decodemeta(mark[3])
-                    for i, p in enumerate(ctx.parents(), 1):
-                        meta['p%i' % i] = p.hex()
+                    parents = tuple(p.node() for p in ctx.parents())
                     before = len(store._all)
-                    store.create(tr, mark[0], mark[1], mark[2], metadata=meta)
+                    store.create(tr, mark[0], mark[1], mark[2], marks[3],
+                                 parents=parents)
                     if len(store._all) - before:
                         ui.write('created new markers for %i\n' % rev)
             ui.progress(pgop, idx, total=pgtotal)