svn commit: samba r6923 - in trunk/source/script: .
metze at samba.org
metze at samba.org
Fri May 20 14:08:06 GMT 2005
Author: metze
Date: 2005-05-20 14:08:06 +0000 (Fri, 20 May 2005)
New Revision: 6923
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6923
Log:
merge rev 6920 from 4_0:
display the SVN revision in svk build of tree's directly mirrored from samba.org
metze
Modified:
trunk/source/script/mkversion.sh
Changeset:
Modified: trunk/source/script/mkversion.sh
===================================================================
--- trunk/source/script/mkversion.sh 2005-05-20 13:58:11 UTC (rev 6922)
+++ trunk/source/script/mkversion.sh 2005-05-20 14:08:06 UTC (rev 6923)
@@ -54,7 +54,12 @@
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
More information about the samba-cvs
mailing list