[asterisk-commits] kpfleming: branch 1.4 r65541 - /branches/1.4/build_tools/make_version

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue May 22 15:25:41 2007
New Revision: 65541

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

Modified:
    branches/1.4/build_tools/make_version

Modified: branches/1.4/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/branches/1.4/build_tools/make_version?view=diff&rev=65541&r1=65540&r2=65541
==============================================================================
--- branches/1.4/build_tools/make_version (original)
+++ branches/1.4/build_tools/make_version Tue May 22 15:25:41 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