From 1f6204a37f7edcd924d4cee8a22f9a6c0b8c50ff Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@614ede4d-c843-0410-af14-a771ab80d22e>
Date: Tue, 22 May 2007 20:25:41 +0000
Subject: [PATCH] when building a version string for a developer branch,
 include the base branch in the version string

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@65541 614ede4d-c843-0410-af14-a771ab80d22e
---
 build_tools/make_version | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build_tools/make_version b/build_tools/make_version
index 6176de2c0..a29fe2b32 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
-- 
2.11.4.GIT