summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-04 12:33:51 -0400
committerOz Linden <oz@lindenlab.com>2013-06-04 12:33:51 -0400
commita3a933e2120e4edf3c7f3c85a8ca04d76570f8ec (patch)
treea428c96a154993bfde78f656b355b2c3fa6bcf5d /indra
parent3c2920297e261a4df429037c08eba3f10b16e8c7 (diff)
fix local build numbers when compiling a merge before committing (two parents)
Diffstat (limited to 'indra')
-rwxr-xr-xindra/cmake/BuildVersion.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/BuildVersion.cmake b/indra/cmake/BuildVersion.cmake
index 0094e313c7..b9ec8f5266 100755
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -18,7 +18,7 @@ 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} parents --template "{rev}"
+ COMMAND ${MERCURIAL} log -r tip --template "{p1rev}"
OUTPUT_VARIABLE VIEWER_VERSION_REVISION
OUTPUT_STRIP_TRAILING_WHITESPACE
)