Mercurial > hg > soundsoftware-site
comparison 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 |
comparison
equal
deleted
inserted
replaced
118:b859cc0c4fa1 | 120:cd2282d2aa55 |
---|---|
281 end | 281 end |
282 | 282 |
283 # convert a date/time into the CVS-format | 283 # convert a date/time into the CVS-format |
284 def time_to_cvstime(time) | 284 def time_to_cvstime(time) |
285 return nil if time.nil? | 285 return nil if time.nil? |
286 return Time.now if time == 'HEAD' | |
287 | |
286 unless time.kind_of? Time | 288 unless time.kind_of? Time |
287 time = Time.parse(time) | 289 time = Time.parse(time) |
288 end | 290 end |
289 return time.strftime("%Y-%m-%d %H:%M:%S") | 291 return time.strftime("%Y-%m-%d %H:%M:%S") |
290 end | 292 end |