[PATCH] rollback: clarifies the message about the reverted state (issue 2628)

[Dirkjan Ochtman]

On Thu, Feb 10, 2011 at 09:05, Gilles Moris <gilles.moris at free.fr> wrote:
> # HG changeset patch
> # User Gilles Moris <gilles.moris at free.fr>
> # Date 1297324986 -3600
> # Node ID 9705430d311af358bce56bd92293d0705b6bf7f6
> # Parent  69e69b131458023d21ec40aa48fc5299e43ce69b
> rollback: clarifies the message about the reverted state (issue 2628)
>
> Previously, when rolling back a transaction, some users could be confused
> between the level to which the database is rolled back, and the new parents
> of the working directory.
>
>  $ hg rollback
>  rolling back to revision 4 (undo commit)
>
> With this change:
>  $ hg rollback
>  rolling back database to tip revision 4 (undo commit)
>  your working directory is now based on revision 2 and 1
>
> So now the user can realize that the database has been rolled back to an older
> tip, but also that the working directory is not on the tip (here we are
> rolling back the merge of the heads 2 and 1)

I think it would be interesting to see how we can improve on this
message, but I don't care much for your current suggestion. I don't
think we use the word "database" anywhere else for the repo data, and
the message about the working dir seems to indicate that I now have a
clean checkout, whereas I actually have the modifications from the
just-rolled back changeset in it.

Cheers,

Dirkjan