summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-05-26 23:01:10 +0000
committerrubidium <rubidium@openttd.org>2010-05-26 23:01:10 +0000
commite84785a6b9a4b57d382c6d295c5e809fddfd3251 (patch)
tree2cd435e1d74ae8a895b9cb4c2744ce9e214a4de5
parent3b0c091e9727394111346dad9916271072016d0a (diff)
downloadopenttd-e84785a6b9a4b57d382c6d295c5e809fddfd3251.tar.xz
(svn r19898) -Fix [FS#3853]: hg version detection fails for uncommited merges (planetmaker)
-rwxr-xr-xfindversion.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/findversion.sh b/findversion.sh
index 6d5f18e52..f636844dd 100755
--- 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@"`