From: Ryan Anderson <ryan@michonline.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: git@vger.kernel.org
Subject: Re: non-trivial merge failures
Date: Sun, 20 Nov 2005 18:07:38 -0500 [thread overview]
Message-ID: <20051120230738.GA16861@mythryan2.michonline.com> (raw)
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
next prev parent reply other threads:[~2005-11-20 23:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-20 21:49 non-trivial merge failures David S. Miller
2005-11-20 21:51 ` Ismail Donmez
2005-11-20 23:39 ` Johannes Schindelin
2005-11-21 4:15 ` David S. Miller
2005-11-20 23:07 ` Ryan Anderson [this message]
2005-11-21 4:20 ` David S. Miller
[not found] ` <11325498823557-git-send-email-ryan@michonline.com>
2005-11-21 5:31 ` [PATCH] Add Python version checks to the Makefile to automatically set WITH_OWN_SUBPROCESS_PY David S. Miller
2005-11-21 8:26 ` Johannes Schindelin
[not found] ` <20051120221922.GB29291@mail.com>
2005-11-21 4:17 ` non-trivial merge failures David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051120230738.GA16861@mythryan2.michonline.com \
--to=ryan@michonline.com \
--cc=davem@davemloft.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox