Hi,
On Wed, 16 Nov 2005, Johannes Schindelin wrote:
python 2.2.1 is perfectly capable of executing git-merge-recursive,
Well, no.
Actually, my tests ran, but only because they were trivial, or next to it.
In line 477 of git-merge-recursive.py, there is a reference to an __iter__
member of a list (the recs object). Python 2.2.1 does not know about that,
but rather wants to do the iteration over the collection iter(recs).
However, this does not work, as some of the contained objects have to be
skipped.
So I bit the bullet, compiled Python 2.4.2, and it works. Sorry for the
noise.
Ciao,
Dscho