diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-12 01:04:18 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-12 01:04:18 +0000 |
| commit | 512816d68c4992cf9f333704dc095e4493324e93 (patch) | |
| tree | dbfde6b6a3639cc8bf6e6ad14ff92ad55152dde4 /build_tools | |
| parent | 5904624b55afd3281e00575b11761625d7eb4055 (diff) | |
Merged revisions 181542 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r181542 | rmudgett | 2009-03-11 20:00:29 -0500 (Wed, 11 Mar 2009) | 1 line
Use the correct branch integrated property when generating the version string
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@181543 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_version | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build_tools/make_version b/build_tools/make_version index cf8201f8b..fa536a71e 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -10,7 +10,12 @@ elif [ -d .svn ]; then REV=`svnversion -c ${1} | cut -d: -f2` - BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1` + INTEGRATED=`LANG=C svn pg automerge-propname ${1}` + if [ -z "${INTEGRATED}" ] ; then + INTEGRATED=svnmerge-integrated + fi + + BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1` if [ "${PARTS}" = "trunk" ] ; then echo SVN-trunk-r${REV} |