mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 12:16:00 +00:00
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/branches/1.4@65541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user