Mercurial > hg > soundsoftware-site
diff lib/redmine/scm/adapters/.svn/text-base/cvs_adapter.rb.svn-base @ 120:cd2282d2aa55 cannam
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:33:08 +0000 |
parents | af80e5618e9b 8661b858af72 |
children | eeebe205a056 |
line wrap: on
line diff
--- a/lib/redmine/scm/adapters/.svn/text-base/cvs_adapter.rb.svn-base Thu Jan 13 13:21:03 2011 +0000 +++ b/lib/redmine/scm/adapters/.svn/text-base/cvs_adapter.rb.svn-base Thu Jan 13 14:33:08 2011 +0000 @@ -283,6 +283,8 @@ # convert a date/time into the CVS-format def time_to_cvstime(time) return nil if time.nil? + return Time.now if time == 'HEAD' + unless time.kind_of? Time time = Time.parse(time) end