Merged r6042 from trunk.

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/branches/1.2-stable@6046 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-10 08:33:23 +00:00 · 2011-06-10 08:33:23 +00:00 · 136bf86307
parent 07f42c53d0
commit 136bf86307
1 changed files with 2 additions and 1 deletions
--- 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