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

Re: non-trivial merge failures

From
DMDavid S. Miller <davem@davemloft.net>
Date
Nov 21, 2005, 04:17 UTC
Message-ID
<20051120.201712.32582587.davem@davemloft.net>
In-Reply-To
<20051120221922.GB29291@mail.com>
From: Ray Lehtiniemi <rayl@mail.com>
Date: Sun, 20 Nov 2005 15:19:22 -0700
Show 9 quoted lines
> On Sun, Nov 20, 2005 at 01:49:45PM -0800, David S. Miller wrote:
> > 
> > It looks like it's failing to import some python module called
> > "subprocess", and I aparently don't have that installed.
> > /usr/bin/python on this Debian box is aparently python-2.3, do
> > I need to be using python-2.4 for this merge stuff to work?
> 
> Define WITH_OWN_SUBPROCESS_PY in Makefile to install a copy of
> this module.

How about a version check at build or "make test" time so we can get a sensible failure diagnostic instead of a weird cryptic "subprocess import failure" when Python is too old? :-)

At least some better behavior than what we have now, where "make test" still passes when you have this problem.

Previous: David S. MillerNext: David S. Miller
Message 7 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.