diff options
| author | peter1138 <peter1138@openttd.org> | 2008-09-17 08:32:26 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2008-09-17 08:32:26 +0000 |
| commit | 0582039ae01db66552ef9102e830ec2f80c94c08 (patch) | |
| tree | 47216cd28eb8f28ba2a101ddcd7a732085e5c921 | |
| parent | 217db3cb6171dbe108dfca22adb33b82f607771c (diff) | |
| download | openttd-0582039ae01db66552ef9102e830ec2f80c94c08.tar.xz | |
(svn r14353) -Fix: hg revision detection always gave the tip revision, not the current working revision.
| -rwxr-xr-x | findversion.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/findversion.sh b/findversion.sh index f91186d03..0849608d3 100755 --- a/findversion.sh +++ b/findversion.sh @@ -91,7 +91,7 @@ elif [ -d "$ROOT_DIR/.hg" ]; then if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then MODIFIED="2" fi - HASH=`LC_ALL=C hg tip 2>/dev/null | head -n 1 | cut -d: -f3 | cut -c1-8` + HASH=`LC_ALL=C hg parents 2>/dev/null | head -n 1 | cut -d: -f3 | cut -c1-8` REV="h$HASH" BRANCH=`hg branch | sed 's/^default$//'` REV_NR=`LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/"` |