From 2cc38ad86daebbc70748d31a4726f9f157b16eb1 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Sat, 13 Oct 2007 16:21:09 +0000 Subject: [PATCH] Prefer 'Last Changed Rev' over 'Revision' when querying latest revision via Subversion git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@7860 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 fe859ed62..830b4308f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Prefer 'Last Changed Rev' over 'Revision' when querying latest revision via Subversion [Jamis Buck] + * Explicitly require 'stringio' in copy_test [mislav] * When Subversion#query_revision fails, give a more sane error [Jamis Buck] diff --git a/lib/capistrano/recipes/deploy/scm/subversion.rb b/lib/capistrano/recipes/deploy/scm/subversion.rb index 4de260ff0..e0a91b89b 100644 --- a/lib/capistrano/recipes/deploy/scm/subversion.rb +++ b/lib/capistrano/recipes/deploy/scm/subversion.rb @@ -56,7 +56,7 @@ def query_revision(revision) result = yield(command) yaml = YAML.load(result) raise "tried to run `#{command}' and got unexpected result #{result.inspect}" unless Hash === yaml - yaml['Revision'] + yaml['Last Changed Rev'] || yaml['Revision'] end # Determines what the response should be for a particular bit of text