Re: [PATCH 2/3] Rebase to parent branch after git-fetch in "stg pull".

On 02/02/07, Yann Dirson [off-list ref] wrote:

On Fri, Feb 02, 2007 at 07:07:06PM +0100, Yann Dirson wrote:

quoted

quoted

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 :)

I tried the latest GIT and it only fails at t1200. I think I got a
t1001 failure but I fixed it. Do you want me to push the snapshot I
have and you can see whether it fails on your system? I tried it with
both Python 2.4 and 2.3 but what's strange is that 'pull' run manually
(not from the test script) seems to work.

-- 
Catalin