[asterisk-commits] trunk - r7512 in /trunk: ./ build_tools/make_svn_branch_name

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Dec 16 20:22:24 2005
New Revision: 7512

URL: http://svn.digium.com/view/asterisk?rev=7512&view=rev
Log:
Merged revision 7510 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7510 | kpfleming | 2005-12-16 20:20:04 -0600 (Fri, 16 Dec 2005) | 2 lines

fix some buglet when building team branch version strings

........

Modified:
    trunk/   (props changed)
    trunk/build_tools/make_svn_branch_name

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 16 20:22:24 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7470,7508
+/branches/1.2:1-7489,7491-7496,7498-7511

Modified: trunk/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_svn_branch_name?rev=7512&r1=7511&r2=7512&view=diff
==============================================================================
--- trunk/build_tools/make_svn_branch_name (original)
+++ trunk/build_tools/make_svn_branch_name Fri Dec 16 20:22:24 2005
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :'`
+PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
 BRANCH=0
 TEAM=0
 
@@ -47,4 +47,4 @@
   fi
 done
 
-echo ${RESULT}-r${REV}
+echo ${RESULT##-}-r${REV}