[asterisk-commits] kpfleming: trunk r65542 - in /trunk: ./ build_tools/make_version

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 22 15:26:35 2007
New Revision: 65542

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65542
Log:
Merged revisions 65541 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65541 | kpfleming | 2007-05-22 16:25:41 -0400 (Tue, 22 May 2007) | 2 lines

when building a version string for a developer branch, include the base branch in the version string

........

Modified:
    trunk/   (props changed)
    trunk/build_tools/make_version

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_version?view=diff&rev=65542&r1=65541&r2=65542
==============================================================================
--- trunk/build_tools/make_version (original)
+++ trunk/build_tools/make_version Tue May 22 15:26:35 2007
@@ -9,6 +9,8 @@
     TAG=0
     
     REV=`svnversion -c ${1} | cut -d: -f2`
+
+    BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
     
     if [ "${PARTS}" = "trunk" ]
 	then
@@ -60,6 +62,6 @@
 	then
 	echo ${RESULT}
 	else
-	echo SVN-${RESULT##-}-r${REV}
+	echo SVN-${RESULT##-}-r${REV}${BASE:+-${BASE}}
     fi
 fi