Mercurial > hg > soundsoftware-site
comparison 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 |
comparison
equal
deleted
inserted
replaced
118:b859cc0c4fa1 | 120:cd2282d2aa55 |
---|---|
84 end | 84 end |
85 | 85 |
86 def diff(path, rev, rev_to) | 86 def diff(path, rev, rev_to) |
87 scm.diff(path, rev, rev_to) | 87 scm.diff(path, rev, rev_to) |
88 end | 88 end |
89 | 89 |
90 def diff_format_revisions(cs, cs_to, sep=':') | |
91 text = "" | |
92 text << cs_to.format_identifier + sep if cs_to | |
93 text << cs.format_identifier if cs | |
94 text | |
95 end | |
96 | |
90 # Returns a path relative to the url of the repository | 97 # Returns a path relative to the url of the repository |
91 def relative_path(path) | 98 def relative_path(path) |
92 path | 99 path |
93 end | 100 end |
94 | 101 |