From 136bf86307d7fc063f796ef632674b74467f37ca Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 10 Jun 2011 08:33:23 +0000 Subject: [PATCH] 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 --- lib/redmine/scm/adapters/mercurial_adapter.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- 2.39.5