diff -r 61a898576888 -r 1e497df514e2 mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Feb 21 00:57:19 2011 +0100 +++ b/mercurial/localrepo.py Thu Feb 10 09:03:06 2011 +0100 @@ -713,11 +713,12 @@ try: args = self.opener("undo.desc", "r").read().splitlines() if len(args) >= 3 and self.ui.verbose: - desc = _("rolling back to revision %s" + desc = _("repository tip rolled back to revision %s" " (undo %s: %s)\n") % ( int(args[0]) - 1, args[1], args[2]) elif len(args) >= 2: - desc = _("rolling back to revision %s (undo %s)\n") % ( + desc = _("repository tip rolled back to revision %s" + " (undo %s)\n") % ( int(args[0]) - 1, args[1]) except IOError: desc = _("rolling back unknown transaction\n") @@ -740,6 +741,9 @@ self.invalidate() self.dirstate.invalidate() self.destroyed() + self.ui.status(_("working directory now based on " + "revision %s\n") % ( + _(' and ').join(str(p.rev()) for p in self.parents()))) else: self.ui.warn(_("no rollback information available\n")) return 1