From 63f449b81532f4c4471e8942fb31d8bf2926c857 Mon Sep 17 00:00:00 2001
From: Jamis Buck <jamis@37signals.com>
Date: Thu, 31 Jan 2008 05:03:20 +0000
Subject: [PATCH] Capisrano -> Capistrano (closes #10807)

git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@8761 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 CHANGELOG                                       | 2 ++
 lib/capistrano/recipes/deploy/scm/subversion.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 55dbd454..1dfb1b80 100644
--- a/CHANGELOG
+++ b/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]
diff --git a/lib/capistrano/recipes/deploy/scm/subversion.rb b/lib/capistrano/recipes/deploy/scm/subversion.rb
index 03fb9828..798101db 100644
--- a/lib/capistrano/recipes/deploy/scm/subversion.rb
+++ b/lib/capistrano/recipes/deploy/scm/subversion.rb
@@ -80,7 +80,7 @@ module Capistrano
             # 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"