svn commit: r749933 - /buildr/trunk/doc/scripts/buildr-git.rb

[vb...@apache.org]

Author: vborja
Date: Wed Mar  4 07:23:30 2009
New Revision: 749933

URL: http://svn.apache.org/viewvc?rev=749933&view=rev
Log:
Dont use dcommit --no-rebase as it doesnt allow to push more than one commit.

Modified:
    buildr/trunk/doc/scripts/buildr-git.rb

Modified: buildr/trunk/doc/scripts/buildr-git.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/doc/scripts/buildr-git.rb?rev=749933&r1=749932&r2=749933&view=diff
==============================================================================
--- buildr/trunk/doc/scripts/buildr-git.rb (original)
+++ buildr/trunk/doc/scripts/buildr-git.rb Wed Mar  4 07:23:30 2009
@@ -306,18 +306,16 @@
       git('svn', 'fetch', '--svn-remote', opt.apache_svn)
       # rebase svn changes in the desired branch
       git('rebase', "#{opt.apache_svn}/#{opt.svn_branch}", opt.branch)
-      # dcommit but don't rebase
-      ['svn', 'dcommit', '--no-rebase', '--svn-remote', opt.apache_svn,
-       '--commit-url', commit_url].tap do |cmd|
+      # dcommit to the specific svn branch
+      ['svn', 'dcommit', 
+       '--svn-remote', opt.apache_svn, '--commit-url', commit_url].tap do |cmd|
         if opt.svn_username
           cmd << '--username' << opt.svn_username
         end
         git(*cmd)
       end
-      # rebase from svn branch
-      git('rebase', "#{opt.apache_svn}/#{opt.svn_branch}", opt.branch)
       # forward the remote townhall/master to apache/trunk
-      git('push', opt.apache_git, 
+      git('push', opt.apache_git,
           "#{opt.apache_svn}/#{opt.svn_branch}:#{opt.git_branch}")
       # get back to the original branch
       git('checkout', opt.current)