From: Ryan Anderson <ryan@michonline.com>
Date: Sun, 20 Nov 2005 23:07:38 GMT
Subject: Re: non-trivial merge failures
Message-ID: <20051120230738.GA16861@mythryan2.michonline.com>
In-Reply-To: <20051120.134945.104623647.davem@davemloft.net>

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

and fix things up (the second assuming, of course, you have python-2.4
installed)

Alternatively, you can build your own Debian packages with "make deb"
and just install them.


-- 

Ryan Anderson
  sometimes Pug Majere