Mercurial > hg > evolve

changeset 1227:a44a26f8cc48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: adapt to change in core rebase Mercurial core changeset 63e889cc610d (And the ones around it) changed the way graft and rebase work. We adapt to them.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 16 Oct 2014 04:38:37 -0700
parents be31c34bb341
children 7a1784a1c642
files hgext/evolve.py tests/test-stabilize-conflict.t
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -806,14 +806,20 @@
     try:
         try:
             r = rebase.rebasenode(repo, orig.node(), dest.node(),
-                                  {node.nullrev: node.nullrev}, False)
+                                  {node.nullrev: node.nullrev}, False,
+                                  orig.p1().node())
             if r[-1]: #some conflict
                 raise util.Abort(
                         'unresolved merge conflicts (see hg help resolve)')
-            cmdutil.duplicatecopies(repo, orig.node(), dest.node())
             nodenew = rebase.concludenode(repo, orig.node(), dest.node(),
                                           node.nullid, commitmsg)
         except util.Abort, exc:
+            repo.dirstate.beginparentchange()
+            repo.setparents(repo['.'].node(), nullid)
+            repo.dirstate.write()
+            # fix up dirstate for copies and renames
+            copies.duplicatecopies(repo, dest.rev(), orig.p1().rev())
+            repo.dirstate.endparentchange()
             class LocalMergeFailure(MergeFailure, exc.__class__):
                 pass
             exc.__class__ = LocalMergeFailure
--- a/tests/test-stabilize-conflict.t
+++ b/tests/test-stabilize-conflict.t
@@ -143,7 +143,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | @  changeset:   5:71c18f70c34f
+  | o  changeset:   5:71c18f70c34f
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen
@@ -233,7 +233,7 @@
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     babar count up to ten
   |
-  | @  changeset:   8:1836b91c6c1d
+  | o  changeset:   8:1836b91c6c1d
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     babar count up to fifteen