Author: vborja
Date: Wed Mar 4 19:13:33 2009
New Revision: 750109
URL: http://svn.apache.org/viewvc?rev=750109&view=rev
Log:
Using a temp svn remote instead of dcommit --commit-url
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=750109&r1=750108&r2=750109&view=diff
==============================================================================
--- buildr/trunk/doc/scripts/buildr-git.rb (original)
+++ buildr/trunk/doc/scripts/buildr-git.rb Wed Mar 4 19:13:33 2009
@@ -324,15 +324,20 @@
# rebase svn changes in the desired branch
git('rebase', "#{opt.apache_svn}/#{opt.svn_branch}", opt.branch)
git('rebase', "#{opt.apache_git}/#{opt.git_branch}", opt.branch)
-
+
+ # create a temporary svn remote just to push to the svn branch
+ git('config', 'svn-remote.apache-dcommit.url', commit_url)
+
# dcommit to the specific svn branch
- ['svn', 'dcommit',
- '--svn-remote', opt.apache_svn, '--commit-url', commit_url].tap do |cmd|
+ ['svn', 'dcommit', '--svn-remote', "apache-dcommit"].tap do |cmd|
if opt.svn_username
cmd << '--username' << opt.svn_username
end
git(*cmd)
end
+
+ #remove the temporary svn dcommit remote
+ git('config', '--delete-section', 'svn-remote.apache-dcommit')
# update townhall remote ref
git('update-ref',
