git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: non-trivial merge failures

From
RARyan Anderson <ryan@michonline.com>
Date
Nov 20, 2005, 23:07 UTC
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
Previous: David S. MillerNext: David S. Miller
Message 5 of 9 in “non-trivial merge failures”
  1. David S. MillerNov 20, 2005
  2. Ismail DonmezNov 20, 2005
  3. Johannes SchindelinNov 20, 2005
  4. David S. MillerNov 21, 2005
  5. Ryan AndersonNov 20, 2005
  6. David S. MillerNov 21, 2005
  7. David S. MillerNov 21, 2005
  8. David S. MillerNov 21, 2005
  9. Johannes SchindelinNov 21, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.