From ad4f4daae80cb00000aca76e1528add6daf8f033 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 16 Nov 2005 03:33:44 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-merge-recursive.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 1bf73f336..d7d36aa7d 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -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 -- 2.30.2