@matheusbsbs / matheus-bagliano / commits / ad4f4daae8
Fork 0

Give python a chance to find "backported" modules

python 2.2.1 is perfectly capable of executing git-merge-recursive, provided that it finds heapq and sets. All you have to do is to steal heapq.py and sets.py from python 2.3 or newer, and drop them in your GIT_PYTHON_PATH. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>

Johannes Schindelin committed Nov 16, 2005 at 03:33 UTC ad4f4daae80cb00000aca76e1528add6daf8f033
1 file changed +4 -2
git-merge-recursive.py
+4 -2
@@ -3,11 +3,13 @@
3 # Copyright (C) 2005 Fredrik Kuivinen
4 #
5
6 -import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
6 +import sys
7 +sys.path.append('''@@GIT_PYTHON_PATH@@''')
8 +
9 +import math, random, os, re, signal, tempfile, stat, errno, traceback
10 from heapq import heappush, heappop
11 from sets import Set
12
10 -sys.path.append('''@@GIT_PYTHON_PATH@@''')
13 from gitMergeCommon import *
14
15 outputIndent = 0