Use the correct branch integrated property when generating the version string
authorRichard Mudgett <rmudgett@digium.com>
Thu, 12 Mar 2009 01:00:29 +0000 (01:00 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 12 Mar 2009 01:00:29 +0000 (01:00 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181542 65c4cc65-6c06-0410-ace0-fbb531ad65f3

build_tools/make_version

index 67231ff..98e31e6 100755 (executable)
@@ -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}