diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-22 20:26:35 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-22 20:26:35 +0000 |
commit | cba3cb183f97266b0ab6080f1a26d761fd2cff37 (patch) | |
tree | 32e897ad08441e19419ec513016c0ad475a63e3d /build_tools | |
parent | 1006ff5169db3009dc9393e6fcec86cc237f9d70 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@65542 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
-rwxr-xr-x | build_tools/make_version | 4 |
1 files changed, 3 insertions, 1 deletions
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 |