Merge problems after moving directories in a branch

[Martin Geisler]

Matt Mackall <mpm at selenic.com> writes:

> On Thu, 2010-04-01 at 10:41 +0100, Gustavo Narea wrote:
>> Hello, Martin et al.
>> 
>> It's funny, before starting to write this email, another merge went
>> wrong. This time with a different branch.
>
> Send us a log with merge --debug.

Yeah, that's a great idea!

Gustavo: remember that you can redo a merge again and again. So take the
most recent failed merge, update to the first parent and merge with the
second parent again using --debug. Send us the log and do 'hg update -C
tip' to discard the merge and get back to your old tip revision.

-- 
Martin Geisler

Fast and powerful revision control: http://mercurial.selenic.com/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20100402/77a56a7d/attachment.asc>