diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2005-11-16 03:33:44 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-15 22:10:59 -0800 |
| commit | ad4f4daae80cb00000aca76e1528add6daf8f033 (patch) | |
| tree | 1a3192c27df352fb11cb1f430ad174ecd90a3734 | |
| parent | a0fa2a10b401aa4c8b13d176a5e3e3b7c455208f (diff) | |
| download | git-ad4f4daae80cb00000aca76e1528add6daf8f033.tar.gz git-ad4f4daae80cb00000aca76e1528add6daf8f033.tar.xz | |
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>
| -rwxr-xr-x | git-merge-recursive.py | 6 |
1 files 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 |