diff hgext/evolve.py @ 1063:742c1ce79a96

merge with stable

--- a/hgext/evolve.py	Fri Aug 15 12:56:01 2014 -0700
+++ b/hgext/evolve.py	Mon Aug 18 15:57:44 2014 -0700
@@ -1019,7 +1019,7 @@
                     for i, p in enumerate(ctx.parents(), 1):
                         meta['p%i' % i] = p.hex()
                     before = len(store._all)
-                    store.create(tr, mark[0], mark[1], mark[2], meta)
+                    store.create(tr, mark[0], mark[1], mark[2], metadata=meta)
                     if len(store._all) - before:
                         ui.write('created new markers for %i\n' % rev)
             ui.progress(pgop, idx, total=pgtotal)