Mercurial undo command

Thomas Arendsen Hein thomas at intevation.de
Wed May 10 04:42:59 CDT 2006


* Sébastien Pierre <sebastien at xprima.com> [20060509 19:22]:
> Le mardi 09 mai 2006 à 09:41 -0700, Bryan O'Sullivan a écrit :
> > On Mon, 2006-05-08 at 14:23 -0400, Sébastien Pierre wrote:
> > I think I've lost the plot a little here.  Can you illustrate which
> > behaviour it is you don't like with an example, please?
> 
> I started thinking about Mercurial undo command behaviour when I ran
> into the scenario described by the "how I got bitten when merging" mail
> [1].
> 
> To sum up what happened :
> 
>  - I messed up a merge
>  - And wanted to "undo" this mess-up
>  - So I naively typed "hg undo"

'hg merge' now tells you how to redo the merge, e.g.:

0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 1
  hg merge 2

And 'hg undo' is already deprecated now in favour of 'hg rollback'.

Is this a solution for you?

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/


More information about the Mercurial mailing list