# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1527031442 -7200
# Node ID cd194eb336bd38487144ed768bfcf13ab9807df2
# Parent  777c29ac02bf58aa0815dd0795dee0ccf537bdc6# Parent  a1a0cfbffd30d8de837a68e3ecc06ff549922de4
branching: merge with stable

diff -r 777c29ac02bf -r cd194eb336bd hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Tue May 22 21:33:50 2018 +0530
+++ b/hgext3rd/evolve/cmdrewrite.py	Wed May 23 01:24:02 2018 +0200
@@ -1079,7 +1079,7 @@
                     bookmarksmod.deactivate(repo)
                     bmchanges = [(bookactive, newnode.node())]
                     repo._bookmarks.applychanges(repo, tr, bmchanges)
-                commands.update(ui, repo, newnode.rev())
+                commands.update(ui, repo, newnode.hex())
                 ui.status(_('working directory now at %s\n')
                           % ui.label(str(newnode), 'evolve.node'))
                 if movebookmark:
diff -r 777c29ac02bf -r cd194eb336bd hgext3rd/evolve/rewriteutil.py
--- a/hgext3rd/evolve/rewriteutil.py	Tue May 22 21:33:50 2018 +0530
+++ b/hgext3rd/evolve/rewriteutil.py	Wed May 23 01:24:02 2018 +0200
@@ -136,7 +136,7 @@
     """prepare the working directory for a split (for topic hooking)
     """
     hg.update(repo, prev)
-    commands.revert(ui, repo, rev=ctx.rev(), all=True)
+    commands.revert(ui, repo, rev=ctx.hex(), all=True)
 
 def reachablefrombookmark(repo, revs, bookmarks):
     """filter revisions and bookmarks reachable from the given bookmark