From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Mon, 24 Oct 2005 06:25:58 GMT
Subject: Re: LCA2006 Git/Cogito tutorial
Message-ID: <46a038f90510232325y8fbea09g19bae8c95f5a7aa0@mail.gmail.com>
In-Reply-To: <20051023224022.GX30889@pasky.or.cz>

On 10/24/05, Petr Baudis <pasky@suse.cz> wrote:
> Dear diary, on Sun, Oct 23, 2005 at 05:33:43PM CEST, I got a letter
> where Horst von Brand <vonbrand@inf.utfsm.cl> told me that...
> > Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> wrote:
> > [...]
> > >     MERGE ERROR: : Not handling case  ->  ->
> >
> > It happens when a new file with the same name appears in both parents. For
> > example, we both see the need for a README file, and then I pull from you
> > and try to merge into my version.
>
> It certainly shouldn't happen with precisely that error message - there
> should be at least something written between the arrows. And yes, there
> are unhandled cases like that, as I wrote in one of my other mails.

As I painfully discovered later, I had updated my tree at the wrong
time, and got caught with a cg-Xmerge.sh that had lost all its
parameters over the numbered params/named params transition. I got a
fresh checkout, rebased my local patches, and life is good again.

Sorry about the noise!


martin