Browse Source

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>
maint
Johannes Schindelin 19 years ago committed by Junio C Hamano
parent
commit
ad4f4daae8
  1. 6
      git-merge-recursive.py

6
git-merge-recursive.py

@ -3,11 +3,13 @@ @@ -3,11 +3,13 @@
# Copyright (C) 2005 Fredrik Kuivinen
#

import sys, math, random, os, re, signal, tempfile, stat, errno, traceback
import sys
sys.path.append('''@@GIT_PYTHON_PATH@@''')

import math, random, os, re, signal, tempfile, stat, errno, traceback
from heapq import heappush, heappop
from sets import Set

sys.path.append('''@@GIT_PYTHON_PATH@@''')
from gitMergeCommon import *

outputIndent = 0

Loading…
Cancel
Save