From: Alex Riesen <raa.lkml@gmail.com>
Date: Fri, 11 Nov 2005 18:52:46 GMT
Subject: Re: merge-recursive: include heapq?
Message-ID: <20051111185246.GB13524@steel.home>
In-Reply-To: <Pine.LNX.4.63.0511111520260.7575@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin, Fri, Nov 11, 2005 15:23:04 +0100:
> I get this when pulling:
> 
> -- snip --
> Traceback (most recent call last):
>   File "./git-merge-recursive", line 4, in ?
>     from heapq import heappush, heappop
> ImportError: No module named heapq
> -- snap --
> 
> 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 :)