From 2d6804b03ee4b4ed6ddef4ebd9e2474d1c1e530a Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Fri, 21 May 2010 17:31:37 +0000
Subject: [PATCH] HBASE-2590 Failed parse of branch element in saveVersion.sh

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@947082 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt        | 1 +
 src/saveVersion.sh | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index f01a544791b..55542aef59e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -348,6 +348,7 @@ Release 0.21.0 - Unreleased
    HBASE-2582  TestTableSchemaModel not passing after commit of blooms
    HBASE-2583  Make webapps work in distributed mode again and make webapps
                deploy at / instead of at /webapps/master/master.jsp
+   HBASE-2590  Failed parse of branch element in saveVersion.sh
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable
diff --git a/src/saveVersion.sh b/src/saveVersion.sh
index 78a6369622a..73778b48e68 100755
--- a/src/saveVersion.sh
+++ b/src/saveVersion.sh
@@ -31,25 +31,18 @@ cwd=`pwd`
 if [ -d .svn ]; then
   revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
   url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
-  # Get canonical branch (branches/X, tags/X, or trunk)
-  branch=`echo $url | sed -n -e 's,.*\(branches/.*\)$,\1,p' \
-                             -e 's,.*\(tags/.*\)$,\1,p' \
-                             -e 's,.*trunk$,trunk,p'`
 elif [ -d ../.git ]; then
   revision=`git log -1 --pretty=format:"%H"`
   hostname=`hostname`
-  branch=`git branch | sed -n -e 's/^* //p'`
   url="git://${hostname}${cwd}"
 else
   revision="Unknown"
-  branch="Unknown"
   url="file://$cwd"
 fi
 mkdir -p $outputDirectory/org/apache/hadoop/hbase
 cat << EOF | \
   sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
       -e "s|URL|$url|" -e "s/REV/$revision/" \
-      -e "s|BRANCH|$branch|" \
       > $outputDirectory/org/apache/hadoop/hbase/package-info.java
 /*
  * Generated by src/saveVersion.sh