[svn-commits] kpfleming: branch oej/moremanager r65540 - /team/oej/moremanager/build_tools/

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 22 15:20:11 2007
New Revision: 65540

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65540
Log:
when building the version string for a developer branch, include the base branch information in the version string

Modified:
    team/oej/moremanager/build_tools/make_version

Modified: team/oej/moremanager/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/team/oej/moremanager/build_tools/make_version?view=diff&rev=65540&r1=65539&r2=65540
==============================================================================
--- team/oej/moremanager/build_tools/make_version (original)
+++ team/oej/moremanager/build_tools/make_version Tue May 22 15:20:11 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