From 53161f3c4cc975c3d4e820b1c5183a4664383dc5 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 17 Sep 2008 08:32:26 +0000 Subject: [PATCH] (svn r14353) -Fix: hg revision detection always gave the tip revision, not the current working revision. --- findversion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/findversion.sh b/findversion.sh index f91186d033..0849608d37 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/"`