Re: merge-recursive: include heapq?

From

Junio C Hamano <junkio@cox.net>

Date

Nov 11, 2005, 19:26 UTC

Message-ID

<7viruzm1e8.fsf@assigned-by-dhcp.cox.net>

In-Reply-To

<20051111185246.GB13524@steel.home>

Alex Riesen <raa.lkml@gmail.com> writes:

> Johannes Schindelin, Fri, Nov 11, 2005 15:23:04 +0100:
>> I get this when pulling:
>>... 
>> Okay, my python is *old*:
>> 
>> $ python -V
>> Python 2.2.1
>> 
>> Is it worthwhile to include heapq as we did with subprocess? Or should I 
>> upgrade...
>
> Trying really trivial in-index merge...
> fatal: Merge requires file-level merging
> Nope.
> Traceback (most recent call last):
>   File "/home/raa/bin/git-merge-recursive", line 8, in ?
>     from gitMergeCommon import *
>   File "/home/raa/share/git-core/python/gitMergeCommon.py", line 14, in ?
>     import subprocess
> ImportError: No module named subprocess
> Automatic merge failed/prevented; fix up by hand
>
> That said, I thought an upgrade was worth it and upgraded my 2.3 to 2.4 :)

Something like this is needed, I suppose...

-- >8 -- cut here -- >8 --
INSTALL: duplicate python requirements from Makefile

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
git diff

diff --git a/INSTALL b/INSTALL
index 06b11e1..63ccf62 100644
--- a/INSTALL
+++ b/INSTALL
@@ -75,3 +75,15 @@ Issues of note:
           history graphically
 
 	- "ssh" is used to push and pull over the net
+
+	- "perl" and POSIX-compliant shells are needed to use most of
+	  the barebone Porcelainish scripts.
+
+	- "python" 2.3 or more recent; if you have 2.3, you may need
+          to build with "make WITH_OWN_SUBPROCESS_PY=YesPlease".
+
+ - Some platform specific issues are dealt with Makefile rules,
+   but depending on your specific installation, you may not
+   have all the libraries/tools needed, or you may have
+   necessary libraries at unusual locations.  Please look at the
+   top of the Makefile to see what can be adjusted for your needs.

Compilation finished at Fri Nov 11 11:24:14