[svn-commits] rmudgett: trunk r181542 - /trunk/build_tools/make_version

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Mar 11 20:00:29 2009
New Revision: 181542

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181542
Log:
Use the correct branch integrated property when generating the version string

Modified:
    trunk/build_tools/make_version

Modified: trunk/build_tools/make_version
URL: http://svn.digium.com/svn-view/asterisk/trunk/build_tools/make_version?view=diff&rev=181542&r1=181541&r2=181542
==============================================================================
--- trunk/build_tools/make_version (original)
+++ trunk/build_tools/make_version Wed Mar 11 20:00:29 2009
@@ -10,7 +10,12 @@
 
     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}