Re: merge-recursive: include heapq?

From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Nov 11, 2005, 19:09 UTC
Message-ID: <20051111190926.GD458@andrew-vasquezs-powerbook-g4-15.local>
In-Reply-To: <20051111185246.GB13524@steel.home>

On Fri, 11 Nov 2005, Alex Riesen wrote:

Show 28 quoted lines

> 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

Had the same problem earlier today, building with WITH_OWN_SUBPROCESS_PY fixed things up...

-- av