[llvm-commits] [llvm] r155049 - /llvm/trunk/utils/release/tag.sh

[Bill Wendling]

Author: void
Date: Wed Apr 18 16:38:12 2012
New Revision: 155049

URL: http://llvm.org/viewvc/llvm-project?rev=155049&view=rev
Log:
Add a flag to rebranch if we need to.

Modified:
    llvm/trunk/utils/release/tag.sh

Modified: llvm/trunk/utils/release/tag.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/release/tag.sh?rev=155049&r1=155048&r2=155049&view=diff
==============================================================================
--- llvm/trunk/utils/release/tag.sh (original)
+++ llvm/trunk/utils/release/tag.sh Wed Apr 18 16:38:12 2012
@@ -16,26 +16,33 @@
 
 release=""
 rc=""
+rebranch="no"
 
 base_url="https://llvm.org/svn/llvm-project"
 
 function usage() {
-    echo "usage: `basename $0` -release <num>"
+    echo "usage: `basename $0` -release <num> [-rebranch]"
     echo "usage: `basename $0` -release <num> -rc <num>"
     echo " "
     echo "  -release <num>  The version number of the release"
     echo "  -rc <num>       The release candidate number"
+    echo "  -rebranch       Remove existing branch, if present, before branching"
     echo "  -final          Tag final release candidate"
 }
 
 function tag_version() {
     set -x
     for proj in llvm cfe dragonegg test-suite compiler-rt ; do
-        if ! svn ls $base_url/$proj/branches/release_$release > /dev/null 2>&1 ; then
-            svn copy -m "Creating release_$release branch" \
-                $base_url/$proj/trunk \
+        if svn ls $base_url/$proj/branches/release_$release > /dev/null 2>&1 ; then
+            if [ $rebranch = "no" ]; then
+                continue
+            fi
+            svn remove -m "Removing old release_$release branch for rebranching." \
                 $base_url/$proj/branches/release_$release
         fi
+        svn copy -m "Creating release_$release branch" \
+            $base_url/$proj/trunk \
+            $base_url/$proj/branches/release_$release
     done
     set +x
 }
@@ -65,6 +72,9 @@
             shift
             rc="rc$1"
             ;;
+        -rebranch | --rebranch )
+            rebranch="yes"
+            ;;
         -final | --final )
             rc="final"
             ;;