# Re: Stacked GIT 0.3 (now more Quilt-like) 2 messages from 2005-07-04 to 2006-11-13. Participants: Horst von Brand, Horst H. von Brand. Thread: https://gitlist.dev/t/1099 ## Horst von Brand, 2005-07-04 01:10 Subject: Re: Stacked GIT 0.3 (now more Quilt-like) Message-ID: <200507040110.j641AiYl004190@laptop11.inf.utfsm.cl> URL: https://gitlist.dev/e/200507040110.j641AiYl004190%40laptop11.inf.utfsm.cl In-Reply-To: ``` Catalin Marinas wrote: > On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote: > > Catalin Marinas writes: > > > I know that using -A gives a more detailed output in case of a conflict. > > > The problem is that you will get a conflict even if the changes are > > > identical, making it impossible to detect when a patch was merged > > > upstream. > > OK, I see. How about using wiggle instead? > > > > http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/ [...] > I haven't used wiggle before but I will give it a try (though I prefer > such a tool not to be too smart since it might make mistakes). Last version is 0.6, released 2 years back... I'm not sure it is wise to rely on abandonware. -- 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 ``` ## Horst H. von Brand, 2006-11-13 00:12 Subject: Re: StGIT repository not clonable? Message-ID: <200611130017.kAD0Ch9o003383@laptop13.inf.utfsm.cl> URL: https://gitlist.dev/e/200611130017.kAD0Ch9o003383%40laptop13.inf.utfsm.cl In-Reply-To: ``` Catalin Marinas wrote: > On 11/11/06, Karl Hasselström wrote: > > On 2006-11-11 00:56:47 -0300, Horst H. von Brand wrote: > > > I'm trying to update my StGIT repo here, and get a crash from > > > git-http-fetch (git 1.4.3.4). Trying to clone it anew gives: > > > > It works for me, with > > > > $ git --version > > git version 1.4.3.3.g8387 [...] > Anyway, thanks to Pasky, you can now pull/clone it over the git > protocol directly - git://repo.or.cz/stgit.git. This repository is up > to date. I have a plan to move the main StGIT repository to Pasky's > server but I'm a bit busy with other things at the moment. Thanks! But the failure to pull/clone the original would mean something is wrong with your HTTP repo then (or my git setup). Nobody else seeing this? Strangely, other HTTP repos (e.g., , ) work fine. Perhaps git gets miscompiled with gcc-4.1.1-32 and CFLAGS='-O2 -fomit-frame-pointer' on i386? -- Dr. Horst H. von Brand User #22616 counter.li.org Departamento de Informatica Fono: +56 32 2654431 Universidad Tecnica Federico Santa Maria +56 32 2654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 2797513 ```