{"thread":{"id":"2202","subject":"Re: LCA2006 Git/Cogito tutorial","startedAt":"2005-10-23T15:33:43Z","lastAt":"2005-10-24T06:25:58Z","messageCount":3,"participants":["Horst von Brand","Petr Baudis","Martin Langhoff"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"10491","messageId":"200510231533.j9NFXhOv019272@inti.inf.utfsm.cl","threadId":"2202","inReplyTo":"martin@catalyst.net.nz","subject":"Re: LCA2006 Git/Cogito tutorial","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-10-23T15:33:43Z","receivedAt":"2005-10-23T15:33:43Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> wrote:\n\n[...]\n\n> If you combine the coolness of git-merge.sh with the fact that\n> cg-merge right now is buggy[*]... I'm starting to rely on doing\n> cg-fetch and running git-merge.sh by hand.\n> \n> * I just merged your latest fixes, knowing that they'd conflict on\n> * cg-fetch, but the merge didn't say a thing a bout cg-fetch, and only\n> * complained like this:\n> \n>     MERGE ERROR: : Not handling case  ->  ->\n> \n> But there were no conflicts at all in the tree! It seems to be that\n> it's dropping the upstream changes it doesn't like.\n\nIt happens when a new file with the same name appears in both parents. For\nexample, we both see the need for a README file, and then I pull from you\nand try to merge into my version.\n-- \nDr. Horst H. von Brand                   User #22616 counter.li.org\nDepartamento de Informatica                     Fono: +56 32 654431\nUniversidad Tecnica Federico Santa Maria              +56 32 654239\nCasilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513\n"},{"id":"10503","messageId":"20051023224022.GX30889@pasky.or.cz","threadId":"2202","inReplyTo":"200510231533.j9NFXhOv019272@inti.inf.utfsm.cl","subject":"Re: LCA2006 Git/Cogito tutorial","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-10-23T22:40:22Z","receivedAt":"2005-10-23T22:40:22Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, Oct 23, 2005 at 05:33:43PM CEST, I got a letter\nwhere Horst von Brand <vonbrand@inf.utfsm.cl> told me that...\n> Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> wrote:\n> [...]\n> >     MERGE ERROR: : Not handling case  ->  ->\n> \n> It happens when a new file with the same name appears in both parents. For\n> example, we both see the need for a README file, and then I pull from you\n> and try to merge into my version.\n\nIt certainly shouldn't happen with precisely that error message - there\nshould be at least something written between the arrows. And yes, there\nare unhandled cases like that, as I wrote in one of my other mails.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"10522","messageId":"46a038f90510232325y8fbea09g19bae8c95f5a7aa0@mail.gmail.com","threadId":"2202","inReplyTo":"20051023224022.GX30889@pasky.or.cz","subject":"Re: LCA2006 Git/Cogito tutorial","fromName":"Martin Langhoff","fromEmail":"martin.langhoff@gmail.com","sentAt":"2005-10-24T06:25:58Z","receivedAt":"2005-10-24T06:25:58Z","isPatch":false,"sender":{"key":"martin.langhoff@gmail.com","avatar":"https://gravatar.com/avatar/1e3f311b6c4c15836501901ca58f8c0b0667246488084ba524d8bc9867e22fd9?d=mp&s=160"},"body":"On 10/24/05, Petr Baudis <pasky@suse.cz> wrote:\n> Dear diary, on Sun, Oct 23, 2005 at 05:33:43PM CEST, I got a letter\n> where Horst von Brand <vonbrand@inf.utfsm.cl> told me that...\n> > Martin Langhoff (CatalystIT) <martin@catalyst.net.nz> wrote:\n> > [...]\n> > >     MERGE ERROR: : Not handling case  ->  ->\n> >\n> > It happens when a new file with the same name appears in both parents. For\n> > example, we both see the need for a README file, and then I pull from you\n> > and try to merge into my version.\n>\n> It certainly shouldn't happen with precisely that error message - there\n> should be at least something written between the arrows. And yes, there\n> are unhandled cases like that, as I wrote in one of my other mails.\n\nAs I painfully discovered later, I had updated my tree at the wrong\ntime, and got caught with a cg-Xmerge.sh that had lost all its\nparameters over the numbered params/named params transition. I got a\nfresh checkout, rebased my local patches, and life is good again.\n\nSorry about the noise!\n\n\nmartin\n"}]}