1
0
Fork 0
mirror of https://github.com/capistrano/capistrano synced 2023-03-27 23:21:18 -04:00

Capisrano -> Capistrano (closes #10807)

git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@8761 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck 2008-01-31 05:03:20 +00:00
parent 9ca248bb3e
commit 63f449b815
2 changed files with 3 additions and 1 deletions

View file

@ -1,5 +1,7 @@
*SVN* *SVN*
* Fix typo in Subversion SCM module, encountered when an update fails [kemiller]
* Fix documentation typo in upload.rb [evolving_jerk] * 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] * Added test case to show that the :scm_command is honored by the git SCM module [grempe]

View file

@ -80,7 +80,7 @@ module Capistrano
# subversion is asking for the passphrase for the user's key # subversion is asking for the passphrase for the user's key
"#{variable(:scm_passphrase)}\n" "#{variable(:scm_passphrase)}\n"
when /The entry \'(.+?)\' is no longer a directory/ 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/ when /accept \(t\)emporarily/
# subversion is asking whether to accept the certificate # subversion is asking whether to accept the certificate
"t\n" "t\n"