Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Capisrano -> Capistrano (closes #10807)

git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@8761 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 63f449b81532f4c4471e8942fb31d8bf2926c857 1 parent 9ca248b
@jamis jamis authored
Showing with 3 additions and 1 deletion.
  1. +2 −0  CHANGELOG
  2. +1 −1  lib/capistrano/recipes/deploy/scm/subversion.rb
View
2  CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix typo in Subversion SCM module, encountered when an update fails [kemiller]
+
* Fix documentation typo in upload.rb [evolving_jerk]
* Added test case to show that the :scm_command is honored by the git SCM module [grempe]
View
2  lib/capistrano/recipes/deploy/scm/subversion.rb
@@ -80,7 +80,7 @@ def handle_data(state, stream, text)
# subversion is asking for the passphrase for the user's key
"#{variable(:scm_passphrase)}\n"
when /The entry \'(.+?)\' is no longer a directory/
- raise Capisrano::Error, "subversion can't update because directory '#{$1}' was replaced. Please add it to svn:ignore."
+ raise Capistrano::Error, "subversion can't update because directory '#{$1}' was replaced. Please add it to svn:ignore."
when /accept \(t\)emporarily/
# subversion is asking whether to accept the certificate
"t\n"
Please sign in to comment.
Something went wrong with that request. Please try again.