From: Mark Allen <mrallen1@yahoo.com>
Date: Wed, 07 Dec 2005 18:12:24 GMT
Subject: Re: Failure in t6021 on Red Hat Enterprise Linux 4
Message-ID: <20051207181225.67737.qmail@web34304.mail.mud.yahoo.com>
In-Reply-To: <7vfyp4u7rl.fsf@assigned-by-dhcp.cox.net>

--- Junio C Hamano <junkio@cox.net> wrote:
> Are you using git RPM, or building by hand?
> If the latter, "grep -A2 python INSTALL" may be helpful.

Definitely. Thanks for the pointer -- I rebuilt my git installation with the correct
flag, but there's a bootstrapping problem with the test -- and I'm not a good enough
python programmer to fix it very well.

So, basically the problem is that the subprocess.py module is in the compat directory,
and by default (I think) the git-merge-recursive being tested is only looking in
$HOME/git/git.git where it finds and loads gitMergeCommon.py, but gitMergeCommon.py is
not looking in $HOME/git/git.git/compat which is where subprocess.py lives.

So I hacked in to git-merge-recursive this line at the top of the file

sys.path.append('''/home/mallen/git/git.git/compat''')

at the very top and now the test passes.  

So maybe this points out a problem in the Makefile or in the substitution the Makefile is
using to put in @@GIT_PYTHON_PATH@@

I'm not sure I've clearly explained the issue, and like I said, I'm kind of a Python
baby, so I'm not sure what the best way to fix this problem might be.

Thanks,

--Mark