buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbo...@apache.org
Subject svn commit: r750110 - /buildr/trunk/doc/scripts/buildr-git.rb
Date Wed, 04 Mar 2009 19:14:59 GMT
Author: vborja
Date: Wed Mar  4 19:14:59 2009
New Revision: 750110

URL: http://svn.apache.org/viewvc?rev=750110&view=rev
Log:
Revert "Using a temp svn remote instead of dcommit --commit-url"

That didn't help out

This reverts commit ac4de3cd99a33ad4427832ba1151a2923a954e8f.

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=750110&r1=750109&r2=750110&view=diff
==============================================================================
--- buildr/trunk/doc/scripts/buildr-git.rb (original)
+++ buildr/trunk/doc/scripts/buildr-git.rb Wed Mar  4 19:14:59 2009
@@ -324,20 +324,15 @@
       # 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', "apache-dcommit"].tap do |cmd|
+      ['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
-
-      #remove the temporary svn dcommit remote
-      git('config', '--delete-section', 'svn-remote.apache-dcommit')
       
       # update townhall remote ref
       git('update-ref', 



Mime
View raw message