A tale of user-friendliness with "hg merge" and "hg rollback".
Isaac Jurado
diptongo at gmail.com
Mon Oct 12 16:56:35 CDT 2009
Replying Rob Landley:
>
> I'd forgotten I did this in a fresh checkout of the repository (in an
> attempt to make that weird not-quite-there uncommitted merge commit go
> away). The rollback didn't trim off the last commit in the
> repository, it apparently undid the _clone_. (Which was not the
> behavior I expected, but I suppose makes sense in retrospect.)
Just for the record, rollback undoes the last *transaction*, not to be
confused with the last commit. This means that it truncates the revlogs
to their sizes prior to the last history addition command: commit, clone
and pull. So, for the "clone" case, it truncates the revlogs to the
size they were before cloning, i.e., zero.
Cheers.
--
Isaac Jurado
http://www.krenel.net
"The noblest pleasure is the joy of understanding."
Leonardo da Vinci
More information about the Mercurial
mailing list