Mercurial > hg > soundsoftware-site
diff app/models/.svn/text-base/repository.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 | 5e974759e8b2 |
line wrap: on
line diff
--- a/app/models/.svn/text-base/repository.rb.svn-base Thu Jan 13 13:21:03 2011 +0000 +++ b/app/models/.svn/text-base/repository.rb.svn-base Thu Jan 13 14:33:08 2011 +0000 @@ -86,7 +86,14 @@ def diff(path, rev, rev_to) scm.diff(path, rev, rev_to) end - + + def diff_format_revisions(cs, cs_to, sep=':') + text = "" + text << cs_to.format_identifier + sep if cs_to + text << cs.format_identifier if cs + text + end + # Returns a path relative to the url of the repository def relative_path(path) path