diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-06-14 10:51:15 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-06-14 10:51:15 +0000 |
| commit | b42b697ffbbf87f9973a4b9ee70e0d53c4938c38 (patch) | |
| tree | 65b025863fe1298955c4b598532c9200f4192425 /app/models/repository/cvs.rb | |
| parent | cc9b8f78783bd9f9d8cdcc4c6f47e4416af83b3e (diff) | |
| download | redmine-b42b697ffbbf87f9973a4b9ee70e0d53c4938c38.tar.gz redmine-b42b697ffbbf87f9973a4b9ee70e0d53c4938c38.zip | |
Fixed: unexpected nil when viewing differences on CVS (#1444).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1525 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/repository/cvs.rb')
| -rw-r--r-- | app/models/repository/cvs.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |