[svn-commits] rmudgett: branch 1.6.0 r181543 - in /branches/1.6.0: ./ build_tools/make_version

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Mar 11 20:04:18 2009
New Revision: 181543

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181543
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/build_tools/make_version

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/build_tools/make_version
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/build_tools/make_version?view=diff&rev=181543&r1=181542&r2=181543
==============================================================================
--- branches/1.6.0/build_tools/make_version (original)
+++ branches/1.6.0/build_tools/make_version Wed Mar 11 20:04:18 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}