Mercurial > hg > soundsoftware-site
diff test/fixtures/.svn/text-base/attachments.yml.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 | 753f1380d6bc |
line wrap: on
line diff
--- a/test/fixtures/.svn/text-base/attachments.yml.svn-base Thu Jan 13 13:21:03 2011 +0000 +++ b/test/fixtures/.svn/text-base/attachments.yml.svn-base Thu Jan 13 14:33:08 2011 +0000 @@ -54,11 +54,11 @@ container_type: Issue container_id: 3 downloads: 0 - disk_filename: 060719210727_changeset.diff + disk_filename: 060719210727_changeset_iso8859-1.diff digest: b91e08d0cf966d5c6ff411bd8c4cc3a2 id: 5 filesize: 687 - filename: changeset.diff + filename: changeset_iso8859-1.diff author_id: 2 content_type: text/x-diff attachments_006: @@ -157,3 +157,15 @@ filename: foo.zip author_id: 2 content_type: application/octet-stream +attachments_014: + created_on: 2006-07-19 21:07:27 +02:00 + container_type: Issue + container_id: 3 + downloads: 0 + disk_filename: 060719210727_changeset_utf8.diff + digest: b91e08d0cf966d5c6ff411bd8c4cc3a2 + id: 14 + filesize: 687 + filename: changeset_utf8.diff + author_id: 2 + content_type: text/x-diff