summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-10 07:06:11 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-06-10 07:06:11 +0000
commit3b5db24269fed4044e55665b161341af8e3b0547 (patch)
treeb37a4b18897b67f2d5b4b818db9c299f6d529df4
parentdfe16e1bca65bf36dcfe847a99bf9508afaf3fbf (diff)
downloadredmine-3b5db24269fed4044e55665b161341af8e3b0547.tar.gz
redmine-3b5db24269fed4044e55665b161341af8e3b0547.zip
scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6042 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine/scm/adapters/mercurial_adapter.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index d02ed78b0..c84e5d3ca 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -276,7 +276,8 @@ module Redmine
end
blame
rescue HgCommandAborted
- nil # means not found or cannot be annotated
+ # means not found or cannot be annotated
+ Annotate.new
end
class Revision < Redmine::Scm::Adapters::Revision