{"thread":{"id":"1099","subject":"Re: Stacked GIT 0.3 (now more Quilt-like)","startedAt":"2005-07-04T01:10:44Z","lastAt":"2006-11-13T00:12:43Z","messageCount":2,"participants":["Horst von Brand","Horst H. von Brand"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"5619","messageId":"200507040110.j641AiYl004190@laptop11.inf.utfsm.cl","threadId":"1099","inReplyTo":"catalin.marinas@gmail.com","subject":"Re: Stacked GIT 0.3 (now more Quilt-like)","fromName":"Horst von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2005-07-04T01:10:44Z","receivedAt":"2005-07-04T01:10:44Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Catalin Marinas wrote:\n> On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote:\n> > Catalin Marinas writes:\n> > > I know that using -A gives a more detailed output in case of a conflict.\n> > > The problem is that you will get a conflict even if the changes are\n> > > identical, making it impossible to detect when a patch was merged\n> > > upstream.\n\n> > OK, I see. How about using wiggle instead?\n> > \n> > http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/\n\n[...]\n\n> I haven't used wiggle before but I will give it a try (though I prefer\n> such a tool not to be too smart since it might make mistakes).\n\nLast version is 0.6, released 2 years back... I'm not sure it is wise to\nrely on abandonware.\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":"294445","messageId":"200611130017.kAD0Ch9o003383@laptop13.inf.utfsm.cl","threadId":"1099","inReplyTo":"catalin.marinas@gmail.com","subject":"Re: StGIT repository not clonable?","fromName":"Horst H. von Brand","fromEmail":"vonbrand@inf.utfsm.cl","sentAt":"2006-11-13T00:12:43Z","receivedAt":"2006-11-13T00:12:43Z","isPatch":false,"sender":{"key":"vonbrand@inf.utfsm.cl","avatar":"https://avatars.githubusercontent.com/u/211384?v=4"},"body":"Catalin Marinas wrote:\n> On 11/11/06, Karl Hasselström wrote:\n> > On 2006-11-11 00:56:47 -0300, Horst H. von Brand wrote:\n> > > I'm trying to update my StGIT repo here, and get a crash from\n> > > git-http-fetch (git 1.4.3.4). Trying to clone it anew gives:\n> >\n> > It works for me, with\n> >\n> > $ git --version\n> > git version 1.4.3.3.g8387\n\n[...]\n\n> Anyway, thanks to Pasky, you can now pull/clone it over the git\n> protocol directly - git://repo.or.cz/stgit.git. This repository is up\n> to date. I have a plan to move the main StGIT repository to Pasky's\n> server but I'm a bit busy with other things at the moment.\n\nThanks! But the failure to pull/clone the original would mean something is\nwrong with your HTTP repo then (or my git setup). Nobody else seeing this?\nStrangely, other HTTP repos (e.g., ,\n) work fine. Perhaps git gets\nmiscompiled with gcc-4.1.1-32 and CFLAGS='-O2 -fomit-frame-pointer' on\ni386?\n-- \nDr. Horst H. von Brand User #22616 counter.li.org\nDepartamento de Informatica Fono: +56 32 2654431\nUniversidad Tecnica Federico Santa Maria +56 32 2654239\nCasilla 110-V, Valparaiso, Chile Fax: +56 32 2797513\n"}]}