Permalink
Browse files

not doing non-interactive because it screws up w/ OSX keychain.

workaround for SVN bug

Signed-off-by: François Beausoleil <francois@teksol.info>
  • Loading branch information...
Terry Heath authored and francois committed Jul 10, 2009
1 parent 1bcc16b commit 93d9a9578f0947c62a70b52f86d8d4033cfb56ad
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/piston/svn/revision.rb
  2. +1 −1 lib/piston/svn/working_copy.rb
@@ -37,7 +37,7 @@ def checkout_to(dir)
def update_to(revision)
raise ArgumentError, "Revision #{self.revision} of #{repository.url} was never checked out -- can't update" unless @dir
answer = svn(:update, "--non-interactive", "--revision", revision, @dir)
answer = svn(:update, "--revision", revision, @dir)
if answer =~ /(Updated to|At) revision (\d+)[.]/ then
if revision == "HEAD" then
@revision = $2.to_i
@@ -102,7 +102,7 @@ def downgrade_to(revision)
def merge_local_changes(revision)
logger.debug {"Update to #{revision} in order to merge local changes"}
svn(:update, "--non-interactive", path)
svn(:update, path)
end
def status(subpath=nil)

0 comments on commit 93d9a95

Please sign in to comment.