merge failure recovery

[Matt Mackall]

On Wed, Jun 22, 2005 at 09:28:04AM +0800, Soh Tk-r28629 wrote:
> > -----Original Message-----
> > From: Matt Mackall [mailto:mpm at selenic.com]
> > Hmm. I'd suggest:
> > 
> > - back up your entire tree
> > - run hg parents to figure out what revision you were at before
> > - run hg status to figure out which files in your working dir got changed
> > - delete .hg/dirstate
> > - hg co <base revision>
> > - hg status
> > 
> > (you should now be back to the pre-merge state)
> 
> That sounds like a lot of work. I seemed to be able to restore the
> pre-merge state by 'hg undo'. After which, hg pull and update -m
> would work. However, I am thinking more on how we can continue the
> merging process without having to re-pull, which may be costly if
> the parents aren't residing locally.

What ought to happen is the merge should abort nicely and running it
again should work. I'll try to fix this up.

-- 
Mathematics is the supreme nostalgia of our time.