From 97db0a0cf220652c02b63a12201563b3057c538f Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 10 Jul 2013 14:08:42 +0200
Subject: [PATCH] Fix version string: We don't build a merge before committing
 and don't have two parents!

---
 indra/cmake/BuildVersion.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
index b9ec8f5266..ec2a7bcbb6 100755
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -18,7 +18,8 @@ if (NOT DEFINED VIEWER_SHORT_VERSION) # will be true in indra/, false in indra/n
            find_program(MERCURIAL hg)
            if (DEFINED MERCURIAL)
               execute_process(
-                 COMMAND ${MERCURIAL} log -r tip --template "{p1rev}"
+                 #COMMAND ${MERCURIAL} log -r tip --template "{p1rev}" <FS:Ansa> We don't build a merge before committing and don't have two parents!
+                 COMMAND ${MERCURIAL} log -r tip --template "{rev}"
                  OUTPUT_VARIABLE VIEWER_VERSION_REVISION
                  OUTPUT_STRIP_TRAILING_WHITESPACE
                  )