Mercurial > evolve
changeset 3762:cd194eb336bd
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 23 May 2018 01:24:02 +0200 |
| parents | 777c29ac02bf (current diff) a1a0cfbffd30 (diff) |
| children | 482195001997 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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