cpp/openttd-patchpack/source Changeset - r10162:5ae0d809e038

Changeset - r10162:5ae0d809e038

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

peter1138 - 16 years ago 2008-09-17 08:32:26
peter1138@openttd.org

(svn r14353) -Fix: hg revision detection always gave the tip revision, not the current working revision.

1 file changed with 1 insertions and 1 deletions:

findversion.sh

0 comments (0 inline, 0 general)

findversion.sh

➞

Show inline comments

@@ @@ -82,25 +82,25 @@ elif [ -d "$ROOT_DIR/.git" ]; then @@
 	if [ -n "`git diff-index HEAD \"$SRC_DIR\"`" ]; then
 		MODIFIED="2"
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null | cut -c1-8`
 	REV="g$HASH"
 	BRANCH=`git branch|grep '[*]' | sed 's/\* //;s/^master$//'`
 	REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/"`
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
 	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/"`
 else
 	# We don't know
 	MODIFIED="1"
 	BRANCH=""
 	REV=""
 	REV_NR=""
 fi
 if [ "$MODIFIED" -eq "2" ]; then

0 comments (0 inline, 0 general)