From: Karl Hasselström Date: Wed, 12 Nov 2008 10:14:39 GMT Subject: Re: Stgit and refresh-temp Message-ID: <20081112101439.GA27469@diana.vm.bytemark.co.uk> In-Reply-To: On 2008-11-12 10:02:10 +0000, Catalin Marinas wrote: > I think it's just a matter of updating HEAD on the "merge_conflict" > path but I'm still not fully confident in modifying the new lib > infrastructure. You're probably right. I'll do it, but you're welcome to beat me to it if you like; I promise to read your patch extra carefully if you do. (I'll drop you a mail when I start attacking this, to prevent any duplicated work.) > 2008/11/12 Karl Hasselström : > > > I'll build a test case for that as well. > > We test the conflicts quite a lot in the "push" tests but this > command hasn't been converted to the new infrastructure yet. Yes. As soon as we convert push and/or pop, this will be caught by the test suite. But that just means the test suite needs extending ... -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle