From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 22 May 2007 20:26:35 +0000 (+0000)
Subject: Merged revisions 65541 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2614
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80baf2a40f2f3d3eb583a2c667249e95199157e9;p=thirdparty%2Fasterisk.git

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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/build_tools/make_version b/build_tools/make_version
index 6176de2c0b..a29fe2b322 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -9,6 +9,8 @@ elif [ -d .svn ]; then
     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 @@ elif [ -d .svn ]; then
 	then
 	echo ${RESULT}
 	else
-	echo SVN-${RESULT##-}-r${REV}
+	echo SVN-${RESULT##-}-r${REV}${BASE:+-${BASE}}
     fi
 fi