From b42b697ffbbf87f9973a4b9ee70e0d53c4938c38 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 14 Jun 2008 10:51:15 +0000 Subject: [PATCH] Fixed: unexpected nil when viewing differences on CVS (#1444). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1525 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/repository/cvs.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb index ea75de5d3..5ff7af999 100644 --- a/app/models/repository/cvs.rb +++ b/app/models/repository/cvs.rb @@ -76,7 +76,8 @@ class Repository::Cvs < Repository unless revision_to revision_to=scm.get_previous_revision(revision_from) end - diff=diff+scm.diff(change_from.path, revision_from, revision_to) + file_diff = scm.diff(change_from.path, revision_from, revision_to) + diff = diff + file_diff unless file_diff.nil? end end return diff