[zaptel-commits] kpfleming: trunk r2197 - in /trunk: ./ build_tools/make_svn_branch_name

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Feb 21 08:02:26 2007
New Revision: 2197

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2197
Log:
Merged revisions 2195 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r2195 | kpfleming | 2007-02-21 08:00:59 -0600 (Wed, 21 Feb 2007) | 10 lines

Merged revisions 2194 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r2194 | kpfleming | 2007-02-21 08:00:20 -0600 (Wed, 21 Feb 2007) | 2 lines

use new tag version numbering script

........

................

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

Propchange: trunk/
            ('branch-1.2-merged' removed)

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/zaptel/trunk/build_tools/make_svn_branch_name?view=diff&rev=2197&r1=2196&r2=2197
==============================================================================
--- trunk/build_tools/make_svn_branch_name (original)
+++ trunk/build_tools/make_svn_branch_name Wed Feb 21 08:02:26 2007
@@ -3,6 +3,7 @@
 PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/zaptel/:: | sed -e 's:/: :g'`
 BRANCH=0
 TEAM=0
+TAG=0
 
 REV=`svnversion -c . | cut -d: -f2`
 
@@ -14,6 +15,12 @@
 
 for PART in $PARTS
 do
+  if [ ${TAG} != 0 ]
+  then
+      RESULT="${PART}"
+      break
+  fi
+
   if [ ${BRANCH} != 0 ]
   then
       RESULT="${RESULT}-${PART}"
@@ -35,8 +42,7 @@
 
   if [ "${PART}" = "tags" ]
   then
-      BRANCH=1
-      RESULT="tag"
+      TAG=1
       continue
   fi
 
@@ -47,4 +53,9 @@
   fi
 done
 
-echo ${RESULT##-}-r${REV}
+if [ ${TAG} != 0 ]
+then
+    echo ${RESULT}
+else
+    echo ${RESULT##-}-r${REV}
+fi