From: David S. Miller <davem@davemloft.net>
Date: Mon, 21 Nov 2005 04:20:32 GMT
Subject: Re: non-trivial merge failures
Message-ID: <20051120.202032.37639519.davem@davemloft.net>
In-Reply-To: <20051120230738.GA16861@mythryan2.michonline.com>

From: Ryan Anderson <ryan@michonline.com>
Date: Sun, 20 Nov 2005 18:07:38 -0500

> On Sun, Nov 20, 2005 at 01:49:45PM -0800, David S. Miller wrote:
> > 
> > Every time I try to do a non-trivial merge, I always
> > get this:
> 
> git-merge-recursive became the default merge tool recently, and Debian
> uses Python 2.3 as the default, which lacks "subprocess.py".  Luckily,
> git ships a backport, so you can do:
> 
> 	make WITH_OWN_SUBPROCESS_PY=YesPlease all doc test install install-doc
> or
> 	make PYTHON_PATH=/usr/bin/python2.4 all doc test install install-doc

All these ways to make it work are nice, and in fact I have
no problem with upgrading to python2.4 on my system if that
makes it work.

I have a huge problem with the fact that "make test" passes %100
cleanly even if you have the wrong python version installed.  It's
amazing that this is that possible if even the most non-trivial merge
needs this Python code :-)