hgext3rd/evolve/cmdrewrite.py
changeset 4721 b69497b23d31
parent 4715 12c8b24757f4
child 4723 41885988921e
--- a/hgext3rd/evolve/cmdrewrite.py	Tue Jul 09 10:56:42 2019 -0700
+++ b/hgext3rd/evolve/cmdrewrite.py	Wed Jul 10 18:16:38 2019 +0800
@@ -1397,8 +1397,11 @@
                 else:
                     duplicate = True
 
+        updates = []
+        if len(ctx.parents()) > 1:
+            updates = ctx.parents()
         extradict = {'extra': extra}
-        new, unusedvariable = rewriteutil.rewrite(repo, ctx, [], ctx,
+        new, unusedvariable = rewriteutil.rewrite(repo, ctx, updates, ctx,
                                                   [p1, p2],
                                                   commitopts=extradict)
         # store touched version to help potential children