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

Re: non-trivial merge failures

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 20, 2005, 23:39 UTC
Message-ID
<Pine.LNX.4.63.0511210037320.24681@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<200511202351.42320.ismail@uludag.org.tr>
Hi,
On Sun, 20 Nov 2005, Ismail Donmez wrote:
> Sunday 20 November 2005 23:49 tarihinde ÿÿunlarÿÿ yazmÿÿÿÿtÿÿnÿÿz:
> > ImportError: No module named subprocess
> 
> You need Python 2.4.x, subprocess is a new module in Python 2.4

No, you don't need 2.4, but at least 2.3. If you don't install git, but run it from where you compile it, be sure to set GIT_PYTHON_PATH in your config.mak. In any case, you need to set WITH_OWN_SUBPROCESS_PY for 2.3

Hth, Dscho

Previous: Ismail DonmezNext: David S. Miller
Message 3 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.