summaryrefslogtreecommitdiff
path: root/findversion.sh
diff options
context:
space:
mode:
authorplanetmaker <planetmaker@openttd.org>2014-11-09 16:37:07 +0000
committerplanetmaker <planetmaker@openttd.org>2014-11-09 16:37:07 +0000
commitbc371a2d9eee04a5a495dc7470673c2fc4418da2 (patch)
tree7cda10b3cd8138f5d169d39c78c2044596cfee61 /findversion.sh
parentab087d2d1c27cb2d4a864f6d51ea3b23bc0e3bef (diff)
downloadopenttd-bc371a2d9eee04a5a495dc7470673c2fc4418da2.tar.xz
(svn r27059) -Change: [Makefile] Make sure to use plain mercurial output unaltered by personal presets
Diffstat (limited to 'findversion.sh')
-rwxr-xr-xfindversion.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/findversion.sh b/findversion.sh
index c0d500a8f..362d9b545 100755
--- a/findversion.sh
+++ b/findversion.sh
@@ -106,12 +106,12 @@ elif [ -d "$ROOT_DIR/.git" ]; then
fi
elif [ -d "$ROOT_DIR/.hg" ]; then
# We are a hg checkout
- if [ -n "`hg status | grep -v '^?'`" ]; then
+ if [ -n "`HGPLAIN= hg status | grep -v '^?'`" ]; then
MODIFIED="2"
fi
- HASH=`LC_ALL=C hg id -i | cut -c1-12`
+ HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12`
REV="h`echo $HASH | cut -c1-8`"
- BRANCH="`hg branch | sed 's@^default$@@'`"
+ BRANCH="`HGPLAIN= hg branch | sed 's@^default$@@'`"
TAG="`hg id -t | grep -v 'tip$'`"
if [ -n "$TAG" ]; then
BRANCH=""