diff -r c44534209a0a -r a02d293a1079 hgext/rebase.py --- a/hgext/rebase.py Mon Apr 13 23:03:13 2015 -0700 +++ b/hgext/rebase.py Tue Apr 14 13:17:33 2015 -0700 @@ -358,7 +358,7 @@ # Keep track of the current bookmarks in order to reset them later currentbookmarks = repo._bookmarks.copy() - activebookmark = activebookmark or repo._bookmarkcurrent + activebookmark = activebookmark or repo._activebookmark if activebookmark: bookmarks.deactivate(repo) @@ -1052,7 +1052,7 @@ hg.update(repo, dest) if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): ui.status(_("updating bookmark %s\n") - % repo._bookmarkcurrent) + % repo._activebookmark) else: if opts.get('tool'): raise util.Abort(_('--tool can only be used with --rebase'))