From 0895eae50976de8b0e124ef85e39ed864d29c3d1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 20 May 2005 14:12:28 +0000
Subject: r6925: merge rev 6920 from 4_0: display the SVN revision in svk build
 of tree's directly mirrored from samba.org

metze
(This used to be commit 110c0f6f36b8a5e7b0e1bf4477605ed81aca5580)
---
 source3/script/mkversion.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'source3/script')

diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index 6f49108aba..d9d84a5337 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -54,7 +54,12 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
     if test x"${HAVESVN}" = x"no";then
 	HAVESVK=no
 	svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes
-	TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
+	TMP_MIRRORED_REVISION=`(svk info ${SOURCE_DIR} 2>/dev/null) |grep 'Mirrored From:.*samba\.org.*' |sed -e 's/Mirrored From: .* Rev\..* \([0-9]*\).*/\1/'`
+	if test -n "$TMP_MIRRORED_REVISION"; then
+	    TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}-[SVN-${TMP_MIRRORED_REVISION}]"
+	else
+	    TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
+	fi
     fi
 
     if test x"${HAVESVN}" = x"yes";then
-- 
cgit