You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by vb...@apache.org on 2009/03/04 09:57:51 UTC
svn commit: r749944 - /buildr/trunk/doc/scripts/buildr-git.rb
Author: vborja
Date: Wed Mar 4 08:57:50 2009
New Revision: 749944
URL: http://svn.apache.org/viewvc?rev=749944&view=rev
Log:
buildr-git sync use explicit remote refs
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=749944&r1=749943&r2=749944&view=diff
==============================================================================
--- buildr/trunk/doc/scripts/buildr-git.rb (original)
+++ buildr/trunk/doc/scripts/buildr-git.rb Wed Mar 4 08:57:50 2009
@@ -321,8 +321,8 @@
git('fetch', opt.apache_git)
# rebase svn changes in the desired branch
- git('rebase', '--onto', "#{opt.apache_svn}/#{opt.svn_branch}",
- "#{opt.apache_git}/#{opt.git_branch}", opt.branch)
+ git('rebase', '--onto', "refs/remotes/#{opt.apache_svn}/#{opt.svn_branch}",
+ "refs/remotes/#{opt.apache_git}/#{opt.git_branch}", opt.branch)
# dcommit to the specific svn branch
['svn', 'dcommit',