Mercurial > hg > soundsoftware-site
diff test/fixtures/repositories/.svn/entries @ 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/test/fixtures/repositories/.svn/entries Thu Jan 13 13:21:03 2011 +0000 +++ b/test/fixtures/repositories/.svn/entries Thu Jan 13 14:33:08 2011 +0000 @@ -2,14 +2,14 @@ dir 4707 -http://redmine.rubyforge.org/svn/branches/1.1-stable/test/fixtures/repositories +http://redmine.rubyforge.org/svn/trunk/test/fixtures/repositories http://redmine.rubyforge.org/svn -2011-01-11T04:22:31.643521Z -4684 -tmaruyama +2011-01-10T17:43:01.353336Z +4676 +jplang @@ -32,7 +32,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:45.351765Z 0553391b55404e8ff509358b388f085b 2008-03-12T20:28:49.748698Z 1236 @@ -66,11 +66,11 @@ -2011-01-13T12:50:17.000000Z +2011-01-13T14:09:10.000000Z 2436fc3d3aefeb07b291d5660396ca8d -2011-01-11T04:22:31.643521Z -4684 -tmaruyama +2011-01-10T17:43:01.353336Z +4676 +jplang has-props @@ -100,7 +100,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:45.351765Z bd13c11517bf083e83846aeccff745f1 2010-06-20T16:08:26.745839Z 3800 @@ -134,7 +134,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:45.347765Z fa70d4aeca5639d750d94281ad664957 2007-12-03T19:19:36.156779Z 951 @@ -168,7 +168,7 @@ -2010-11-30T13:11:53.000000Z +2010-11-19T13:04:46.860726Z 300e21b10239e2fa28df3111924b8328 2010-10-29T23:21:57.240368Z 4310 @@ -202,7 +202,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:45.351765Z 9fbee7c5669de84f0767597eb41af9f7 2008-06-08T15:40:24.603157Z 1508 @@ -236,7 +236,7 @@ -2010-08-12T15:03:25.000000Z +2010-09-23T14:37:45.351765Z 0c4730bd5eb192e094531f218b7a3119 2007-12-13T18:52:09.073829Z 987