From: Yann Dirson Date: Fri, 02 Feb 2007 22:42:50 GMT Subject: Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull". Message-ID: <20070202224250.GF5362@nan92-1-81-57-214-146.fbx.proxad.net> In-Reply-To: <20070202180706.GE5362@nan92-1-81-57-214-146.fbx.proxad.net> On Fri, Feb 02, 2007 at 07:07:06PM +0100, Yann Dirson wrote: > > The t1200-push-modified.sh test fails after applying this patch. It > > looks like the 3rd test fails to pull the changes from 'foo' into > > 'bar'. > > Strange, it passes here, even after pulling you latest commits > (HEAD=fba895f5f12a652c248b0fd02b7c41f8342cfbdc). Wondering which GIT version you are using, I tried to run the testsuite with current GIT HEAD, and it fails much earlier (t1001). We'll have some work here :) Best regards, -- Yann.