threads / discuss / 2202

Re: LCA2006 Git/Cogito tutorial

Subject: Re: LCA2006 Git/Cogito tutorial

## tl;dr

3 messages between Oct 23, 2005 and Oct 24, 2005.

replies: 2people: 3as markdown or json

Horst von Brand· Oct 23, 2005, 15:33 UTC · lore

Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> wrote:

[...]

Show 12 quoted lines

> If you combine the coolness of git-merge.sh with the fact that
> cg-merge right now is buggy[*]... I'm starting to rely on doing
> cg-fetch and running git-merge.sh by hand.
> 
> * I just merged your latest fixes, knowing that they'd conflict on
> * cg-fetch, but the merge didn't say a thing a bout cg-fetch, and only
> * complained like this:
> 
>     MERGE ERROR: : Not handling case  ->  ->
> 
> But there were no conflicts at all in the tree! It seems to be that
> it's dropping the upstream changes it doesn't like.

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.

-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513

Petr Baudis· Oct 23, 2005, 22:40 UTC · re: Horst von Brand · lore

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...

Show 7 quoted lines

> 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.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.

Martin Langhoff· Oct 24, 2005, 06:25 UTC · re: Petr Baudis · lore

On 10/24/05, Petr Baudis <pasky@suse.cz> wrote:

Show 13 quoted lines

> 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