[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'release-3.0.0-test-build' - 2 commits - release.sh
From:       ips () fedoraproject ! org (ips)
Date:       2010-06-30 14:28:54
Message-ID: 20100630142854.8E7B1120267 () lists ! fedorahosted ! org
[Download RAW message or body]

 release.sh |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 911fea9bcbfb76d4986098ca03f3df8287fae6f7
Merge: 584b2d4... f936128...
Author: hudson auto <wnstb at yahoo.com>
Date:   Wed Jun 30 10:28:51 2010 -0400

    Merge branch 'release-3.0.0-test-build' of ssh://git.fedorahosted.org/git/rhq/rhq \
into release-3.0.0-test-build



commit 584b2d4ad057cd04b5c32eb83d82b0094801aba5
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date:   Wed Jun 30 10:25:11 2010 -0400

    Add pull prior to push creating remote branch of of local branch. This
    seems to establish that the local branch head is up to date. If not done
    the subsequent push to origin fails with  non-fast-forward error.

diff --git a/release.sh b/release.sh
index ccf6f72..da56c27 100755
--- a/release.sh
+++ b/release.sh
@@ -334,7 +334,7 @@ if [ "$MODE" = "production" ]; then
     BUILD_BRANCH="${RELEASE_BRANCH}"
 else
     BUILD_BRANCH="${RELEASE_BRANCH}-test-build"
-# delete the branch if it exists, so we can recreate it fresh     
+#   delete the branch if it exists, so we can recreate it fresh     
     EXISTING_BUILD_BRANCH=`git ls-remote --heads origin "$BUILD_BRANCH"`
     if [ -n "$EXISTING_BUILD_BRANCH" ]; then
         echo "Deleting remote branch origin/$BUILD_BRANCH"    
@@ -344,7 +344,8 @@ else
     fi
     echo "Creating and checking out local branch $BUILD_BRANCH from $RELEASE_BRANCH" \
  git checkout -b "$BUILD_BRANCH"
-    echo "Creating remote branch $BUILD_BRANCH"    
+    echo "Creating remote branch $BUILD_BRANCH"  
+    git pull origin "$BUILD_BRANCH"
     git push origin "$BUILD_BRANCH"    
 fi
              


[prev in list] [next in list] [prev in thread] [next in thread]