diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-12 01:00:29 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-12 01:00:29 +0000 |
| commit | 64e6dfef23b54d9bc4c20be59e9c7c5b88e65424 (patch) | |
| tree | 54258de660b8b93ada6704640497b82b8f1170ed /build_tools | |
| parent | 21909f34611d4962720a4bbee413fb32dcb17f74 (diff) | |
Use the correct branch integrated property when generating the version string
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@181542 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 67231ff0c..98e31e6bf 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} |