# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2010-05-26 23:01:10
# Node ID 0671324fe9d4cb9728da9c2150d04a549dee9b38
# Parent  9ea5a39492724dd23155d61ce532b96749c37d54

(svn r19898) -Fix [FS#3853]: hg version detection fails for uncommited merges (planetmaker)

diff --git a/findversion.sh b/findversion.sh
--- a/findversion.sh
+++ b/findversion.sh
@@ -101,7 +101,7 @@ elif [ -d "$ROOT_DIR/.hg" ]; then
 	if [ -n "`hg status \"$SRC_DIR\" | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
-	HASH=`LC_ALL=C hg parents --template="{node}"`
+	HASH=`LC_ALL=C hg id -i | cut -c1-12`
 	REV="h`echo $HASH | cut -c1-8`"
 	BRANCH=`hg branch | sed 's@^default$@@'`
 	REV_NR=`LC_ALL=C hg log -r $HASH:0 -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`