summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2011-01-19 17:10:52 +0000
committermichi_cc <michi_cc@openttd.org>2011-01-19 17:10:52 +0000
commit22922414eb3d37a35c4446de39db52420ab2f05d (patch)
tree2c03367e04529b1b6d14e4ce952ee28791a00fcc /projects
parent3f9fa65a42e0a3370a2204a7c0ce570c7476361d (diff)
downloadopenttd-22922414eb3d37a35c4446de39db52420ab2f05d.tar.xz
(svn r21856) -Fix (r21840): Don't fail tag detection on hg repositories that use mercurial queues. Add some safety against tags and branches with spaces as well.
Diffstat (limited to 'projects')
-rwxr-xr-xprojects/determineversion.vbs4
1 files changed, 2 insertions, 2 deletions
diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs
index 9b159785c..097282bfd 100755
--- a/projects/determineversion.vbs
+++ b/projects/determineversion.vbs
@@ -253,10 +253,10 @@ Function DetermineSVNVersion()
Set oExec = WshShell.Exec("hg id -t")
If Err.Number = 0 Then
line = oExec.StdOut.ReadLine()
- If Len(line) > 0 And line <> "tip" Then
+ If Len(line) > 0 And Right(line, 3) <> "tip" Then
version = line
branch = ""
- End If ' Len(line) > 0 And line <> "tip"
+ End If ' Len(line) > 0 And Right(line, 3) <> "tip"
End If ' Err.Number = 0
Err.Clear