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

[vb...@apache.org]

Author: vborja
Date: Wed Mar  4 16:11:54 2009
New Revision: 750061

URL: http://svn.apache.org/viewvc?rev=750061&view=rev
Log:
Trying to get apache sync to merge correctly

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=750061&r1=750060&r2=750061&view=diff
==============================================================================
--- buildr/trunk/doc/scripts/buildr-git.rb (original)
+++ buildr/trunk/doc/scripts/buildr-git.rb Wed Mar  4 16:11:54 2009
@@ -318,11 +318,12 @@
       # obtain latest changes from svn
       git('svn', 'fetch', '--svn-remote', opt.apache_svn)
       # obtain latest changes from git
-      git('fetch', opt.apache_git)
+      git('fetch', opt.apache_git, 
+          "#{opt.git_branch}:refs/remotes/#{opt.apache_git}/#{opt.git_branch}")
 
       # rebase svn changes in the desired branch
-      git('rebase', '--onto', "refs/remotes/#{opt.apache_svn}/#{opt.svn_branch}", 
-          "refs/remotes/#{opt.apache_git}/#{opt.git_branch}", opt.branch)
+      git('rebase', "#{opt.apache_svn}/#{opt.svn_branch}", opt.branch)
+      git('rebase', "#{opt.apache_git}/#{opt.git_branch}", opt.branch)
       
       # dcommit to the specific svn branch
       ['svn', 'dcommit', 
@@ -342,7 +343,6 @@
       git('push', opt.apache_git, 
           "refs/remotes/#{opt.apache_git}/#{opt.git_branch}:#{opt.git_branch}")
 
-    ensure
       # get back to the original branch
       git('checkout', opt.current)
     end