You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/11/09 22:09:28 UTC
svn commit: r1033230 [2/2] - in /subversion/branches/1.5.x: ./
notes/tree-conflicts/ subversion/bindings/swig/ subversion/include/private/
subversion/libsvn_client/ subversion/libsvn_subr/ subversion/libsvn_wc/
subversion/mod_dav_svn/ subversion/tests/...
Propchange: subversion/branches/1.5.x/subversion/libsvn_wc/adm_ops.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 21:09:27 2010
@@ -1,36 +1,36 @@
-subversion/branches/1.5.x-34184/subversion/libsvn_wc/adm_ops.c:874657-874741
-subversion/branches/1.5.x-34432/subversion/libsvn_wc/adm_ops.c:874744-874798
-subversion/branches/1.5.x-issue3067/subversion/libsvn_wc/adm_ops.c:872184-872314
-subversion/branches/1.5.x-issue3157/subversion/libsvn_wc/adm_ops.c:872165-872175
-subversion/branches/1.5.x-issue3174/subversion/libsvn_wc/adm_ops.c:872178-872348
-subversion/branches/1.5.x-r30215/subversion/libsvn_wc/adm_ops.c:870310,870312,870319,870362
-subversion/branches/1.5.x-r30756/subversion/libsvn_wc/adm_ops.c:874853-874870
-subversion/branches/1.5.x-r30868/subversion/libsvn_wc/adm_ops.c:870951-870970
-subversion/branches/1.5.x-r31314/subversion/libsvn_wc/adm_ops.c:874476-874605
-subversion/branches/1.5.x-r31516/subversion/libsvn_wc/adm_ops.c:871592-871649
-subversion/branches/1.5.x-r32470/subversion/libsvn_wc/adm_ops.c:872546-872676
-subversion/branches/1.5.x-r32968/subversion/libsvn_wc/adm_ops.c:873773-873872
-subversion/branches/1.5.x-r33447/subversion/libsvn_wc/adm_ops.c:873527-873547
-subversion/branches/1.5.x-r33465/subversion/libsvn_wc/adm_ops.c:873541-873549
-subversion/branches/1.5.x-r33641/subversion/libsvn_wc/adm_ops.c:873880-873883
-subversion/branches/1.5.x-r34050-followups/subversion/libsvn_wc/adm_ops.c:874639-874686
-subversion/branches/1.5.x-r34487/subversion/libsvn_wc/adm_ops.c:874562-874581
-subversion/branches/1.5.x-r35566/subversion/libsvn_wc/adm_ops.c:875648-876172
-subversion/branches/1.5.x-r36256/subversion/libsvn_wc/adm_ops.c:876332-877824
-subversion/branches/1.5.x-r36613/subversion/libsvn_wc/adm_ops.c:876709-877827
-subversion/branches/1.5.x-r36879/subversion/libsvn_wc/adm_ops.c:876973-877829
-subversion/branches/1.5.x-r36919/subversion/libsvn_wc/adm_ops.c:876996-877831
-subversion/branches/1.5.x-r37156/subversion/libsvn_wc/adm_ops.c:877275-878306
-subversion/branches/1.5.x-r37169/subversion/libsvn_wc/adm_ops.c:877272-878304
-subversion/branches/1.5.x-ra_serf-backports/subversion/libsvn_wc/adm_ops.c:872354-872626
-subversion/branches/1.5.x-rb-test-fix/subversion/libsvn_wc/adm_ops.c:874916-874919
-subversion/branches/1.5.x-reintegrate-improvements/subversion/libsvn_wc/adm_ops.c:874586-874922
-subversion/branches/1.5.x-tests-pass/subversion/libsvn_wc/adm_ops.c:870925-870973
-subversion/branches/issue-3220-dev/subversion/libsvn_wc/adm_ops.c:872210-872226
-subversion/branches/log-g-performance/subversion/libsvn_wc/adm_ops.c:870941-871032
-subversion/branches/r30963-1.5.x/subversion/libsvn_wc/adm_ops.c:871056-871076
-subversion/branches/reintegrate-improvements/subversion/libsvn_wc/adm_ops.c:873853-874164
-subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_wc/adm_ops.c:870196
-subversion/branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.c:871905
-subversion/trunk/bindings/swig:876953
-subversion/trunk/subversion/libsvn_wc/adm_ops.c:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,869
837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,87064
1,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624,
871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,87
3849,873856,873860,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682
+/subversion/branches/1.5.x-34184/subversion/libsvn_wc/adm_ops.c:874657-874741
+/subversion/branches/1.5.x-34432/subversion/libsvn_wc/adm_ops.c:874744-874798
+/subversion/branches/1.5.x-issue3067/subversion/libsvn_wc/adm_ops.c:872184-872314
+/subversion/branches/1.5.x-issue3157/subversion/libsvn_wc/adm_ops.c:872165-872175
+/subversion/branches/1.5.x-issue3174/subversion/libsvn_wc/adm_ops.c:872178-872348
+/subversion/branches/1.5.x-r30215/subversion/libsvn_wc/adm_ops.c:870310,870312,870319,870362
+/subversion/branches/1.5.x-r30756/subversion/libsvn_wc/adm_ops.c:874853-874870
+/subversion/branches/1.5.x-r30868/subversion/libsvn_wc/adm_ops.c:870951-870970
+/subversion/branches/1.5.x-r31314/subversion/libsvn_wc/adm_ops.c:874476-874605
+/subversion/branches/1.5.x-r31516/subversion/libsvn_wc/adm_ops.c:871592-871649
+/subversion/branches/1.5.x-r32470/subversion/libsvn_wc/adm_ops.c:872546-872676
+/subversion/branches/1.5.x-r32968/subversion/libsvn_wc/adm_ops.c:873773-873872
+/subversion/branches/1.5.x-r33447/subversion/libsvn_wc/adm_ops.c:873527-873547
+/subversion/branches/1.5.x-r33465/subversion/libsvn_wc/adm_ops.c:873541-873549
+/subversion/branches/1.5.x-r33641/subversion/libsvn_wc/adm_ops.c:873880-873883
+/subversion/branches/1.5.x-r34050-followups/subversion/libsvn_wc/adm_ops.c:874639-874686
+/subversion/branches/1.5.x-r34487/subversion/libsvn_wc/adm_ops.c:874562-874581
+/subversion/branches/1.5.x-r35566/subversion/libsvn_wc/adm_ops.c:875648-876172
+/subversion/branches/1.5.x-r36256/subversion/libsvn_wc/adm_ops.c:876332-877824
+/subversion/branches/1.5.x-r36613/subversion/libsvn_wc/adm_ops.c:876709-877827
+/subversion/branches/1.5.x-r36879/subversion/libsvn_wc/adm_ops.c:876973-877829
+/subversion/branches/1.5.x-r36919/subversion/libsvn_wc/adm_ops.c:876996-877831
+/subversion/branches/1.5.x-r37156/subversion/libsvn_wc/adm_ops.c:877275-878306
+/subversion/branches/1.5.x-r37169/subversion/libsvn_wc/adm_ops.c:877272-878304
+/subversion/branches/1.5.x-ra_serf-backports/subversion/libsvn_wc/adm_ops.c:872354-872626
+/subversion/branches/1.5.x-rb-test-fix/subversion/libsvn_wc/adm_ops.c:874916-874919
+/subversion/branches/1.5.x-reintegrate-improvements/subversion/libsvn_wc/adm_ops.c:874586-874922
+/subversion/branches/1.5.x-tests-pass/subversion/libsvn_wc/adm_ops.c:870925-870973
+/subversion/branches/issue-3220-dev/subversion/libsvn_wc/adm_ops.c:872210-872226
+/subversion/branches/log-g-performance/subversion/libsvn_wc/adm_ops.c:870941-871032
+/subversion/branches/r30963-1.5.x/subversion/libsvn_wc/adm_ops.c:871056-871076
+/subversion/branches/reintegrate-improvements/subversion/libsvn_wc/adm_ops.c:873853-874164
+/subversion/branches/svn-mergeinfo-enhancements/subversion/libsvn_wc/adm_ops.c:870196
+/subversion/branches/svnpatch-diff/subversion/libsvn_wc/adm_ops.c:871905
+/subversion/trunk/bindings/swig:876953
+/subversion/trunk/subversion/libsvn_wc/adm_ops.c:869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869815-869818,869820,869825,86
9837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620,870622,870625-870626,8706
41,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,871597,871608,871620,871624
,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873715,873718,873767,873778,8
73849,873856,873860,873862,873914,873940,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060
Modified: subversion/branches/1.5.x/subversion/mod_dav_svn/authz.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/subversion/mod_dav_svn/authz.c?rev=1033230&r1=1033229&r2=1033230&view=diff
==============================================================================
--- subversion/branches/1.5.x/subversion/mod_dav_svn/authz.c (original)
+++ subversion/branches/1.5.x/subversion/mod_dav_svn/authz.c Tue Nov 9 21:09:27 2010
@@ -59,7 +59,7 @@ allow_read(request_rec *r,
allow_read_bypass = dav_svn__get_pathauthz_bypass(r);
if (allow_read_bypass != NULL)
{
- if (allow_read_bypass(r,path, repos->repo_name) == OK)
+ if (allow_read_bypass(r, path, repos->repo_basename) == OK)
return TRUE;
else
return FALSE;
Propchange: subversion/branches/1.5.x/subversion/tests/cmdline/svntest/actions.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 21:09:27 2010
@@ -1,36 +1,36 @@
-subversion/branches/1.5.x-34184/subversion/tests/cmdline/svntest/actions.py:874657-874741
-subversion/branches/1.5.x-34432/subversion/tests/cmdline/svntest/actions.py:874744-874798
-subversion/branches/1.5.x-issue3067/subversion/tests/cmdline/svntest/actions.py:872184-872314
-subversion/branches/1.5.x-issue3157/subversion/tests/cmdline/svntest/actions.py:872165-872175
-subversion/branches/1.5.x-issue3174/subversion/tests/cmdline/svntest/actions.py:872178-872348
-subversion/branches/1.5.x-r30215/subversion/tests/cmdline/svntest/actions.py:870310,870312,870319,870362
-subversion/branches/1.5.x-r30756/subversion/tests/cmdline/svntest/actions.py:874853-874870
-subversion/branches/1.5.x-r30868/subversion/tests/cmdline/svntest/actions.py:870951-870970
-subversion/branches/1.5.x-r31314/subversion/tests/cmdline/svntest/actions.py:874476-874605
-subversion/branches/1.5.x-r31516/subversion/tests/cmdline/svntest/actions.py:871592-871649
-subversion/branches/1.5.x-r32470/subversion/tests/cmdline/svntest/actions.py:872546-872676
-subversion/branches/1.5.x-r32968/subversion/tests/cmdline/svntest/actions.py:873773-873872
-subversion/branches/1.5.x-r33447/subversion/tests/cmdline/svntest/actions.py:873527-873547
-subversion/branches/1.5.x-r33465/subversion/tests/cmdline/svntest/actions.py:873541-873549
-subversion/branches/1.5.x-r33641/subversion/tests/cmdline/svntest/actions.py:873880-873883
-subversion/branches/1.5.x-r34050-followups/subversion/tests/cmdline/svntest/actions.py:874639-874686
-subversion/branches/1.5.x-r34487/subversion/tests/cmdline/svntest/actions.py:874562-874581
-subversion/branches/1.5.x-r35566/subversion/tests/cmdline/svntest/actions.py:875648-876172
-subversion/branches/1.5.x-r36256/subversion/tests/cmdline/svntest/actions.py:876332-877824
-subversion/branches/1.5.x-r36613/subversion/tests/cmdline/svntest/actions.py:876709-877827
-subversion/branches/1.5.x-r36879/subversion/tests/cmdline/svntest/actions.py:876973-877829
-subversion/branches/1.5.x-r36919/subversion/tests/cmdline/svntest/actions.py:876996-877831
-subversion/branches/1.5.x-r37156/subversion/tests/cmdline/svntest/actions.py:877275-878306
-subversion/branches/1.5.x-r37169/subversion/tests/cmdline/svntest/actions.py:877272-878304
-subversion/branches/1.5.x-ra_serf-backports/subversion/tests/cmdline/svntest/actions.py:872354-872626
-subversion/branches/1.5.x-rb-test-fix/subversion/tests/cmdline/svntest/actions.py:874916-874919
-subversion/branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py:874586-874922
-subversion/branches/1.5.x-tests-pass/subversion/tests/cmdline/svntest/actions.py:870925-870973
-subversion/branches/issue-3220-dev/subversion/tests/cmdline/svntest/actions.py:872210-872226
-subversion/branches/log-g-performance/subversion/tests/cmdline/svntest/actions.py:870941-871032
-subversion/branches/r30963-1.5.x/subversion/tests/cmdline/svntest/actions.py:871056-871076
-subversion/branches/reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py:873853-874164
-subversion/branches/svn-mergeinfo-enhancements/subversion/tests/cmdline/svntest/actions.py:870196
-subversion/branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py:871905
-subversion/trunk:876953
-subversion/trunk/subversion/tests/cmdline/svntest/actions.py:836421-857791,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,8698
15-869818,869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,870620
,870622,870625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,8
71597,871608,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,873
715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874048,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682
+/subversion/branches/1.5.x-34184/subversion/tests/cmdline/svntest/actions.py:874657-874741
+/subversion/branches/1.5.x-34432/subversion/tests/cmdline/svntest/actions.py:874744-874798
+/subversion/branches/1.5.x-issue3067/subversion/tests/cmdline/svntest/actions.py:872184-872314
+/subversion/branches/1.5.x-issue3157/subversion/tests/cmdline/svntest/actions.py:872165-872175
+/subversion/branches/1.5.x-issue3174/subversion/tests/cmdline/svntest/actions.py:872178-872348
+/subversion/branches/1.5.x-r30215/subversion/tests/cmdline/svntest/actions.py:870310,870312,870319,870362
+/subversion/branches/1.5.x-r30756/subversion/tests/cmdline/svntest/actions.py:874853-874870
+/subversion/branches/1.5.x-r30868/subversion/tests/cmdline/svntest/actions.py:870951-870970
+/subversion/branches/1.5.x-r31314/subversion/tests/cmdline/svntest/actions.py:874476-874605
+/subversion/branches/1.5.x-r31516/subversion/tests/cmdline/svntest/actions.py:871592-871649
+/subversion/branches/1.5.x-r32470/subversion/tests/cmdline/svntest/actions.py:872546-872676
+/subversion/branches/1.5.x-r32968/subversion/tests/cmdline/svntest/actions.py:873773-873872
+/subversion/branches/1.5.x-r33447/subversion/tests/cmdline/svntest/actions.py:873527-873547
+/subversion/branches/1.5.x-r33465/subversion/tests/cmdline/svntest/actions.py:873541-873549
+/subversion/branches/1.5.x-r33641/subversion/tests/cmdline/svntest/actions.py:873880-873883
+/subversion/branches/1.5.x-r34050-followups/subversion/tests/cmdline/svntest/actions.py:874639-874686
+/subversion/branches/1.5.x-r34487/subversion/tests/cmdline/svntest/actions.py:874562-874581
+/subversion/branches/1.5.x-r35566/subversion/tests/cmdline/svntest/actions.py:875648-876172
+/subversion/branches/1.5.x-r36256/subversion/tests/cmdline/svntest/actions.py:876332-877824
+/subversion/branches/1.5.x-r36613/subversion/tests/cmdline/svntest/actions.py:876709-877827
+/subversion/branches/1.5.x-r36879/subversion/tests/cmdline/svntest/actions.py:876973-877829
+/subversion/branches/1.5.x-r36919/subversion/tests/cmdline/svntest/actions.py:876996-877831
+/subversion/branches/1.5.x-r37156/subversion/tests/cmdline/svntest/actions.py:877275-878306
+/subversion/branches/1.5.x-r37169/subversion/tests/cmdline/svntest/actions.py:877272-878304
+/subversion/branches/1.5.x-ra_serf-backports/subversion/tests/cmdline/svntest/actions.py:872354-872626
+/subversion/branches/1.5.x-rb-test-fix/subversion/tests/cmdline/svntest/actions.py:874916-874919
+/subversion/branches/1.5.x-reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py:874586-874922
+/subversion/branches/1.5.x-tests-pass/subversion/tests/cmdline/svntest/actions.py:870925-870973
+/subversion/branches/issue-3220-dev/subversion/tests/cmdline/svntest/actions.py:872210-872226
+/subversion/branches/log-g-performance/subversion/tests/cmdline/svntest/actions.py:870941-871032
+/subversion/branches/r30963-1.5.x/subversion/tests/cmdline/svntest/actions.py:871056-871076
+/subversion/branches/reintegrate-improvements/subversion/tests/cmdline/svntest/actions.py:873853-874164
+/subversion/branches/svn-mergeinfo-enhancements/subversion/tests/cmdline/svntest/actions.py:870196
+/subversion/branches/svnpatch-diff/subversion/tests/cmdline/svntest/actions.py:871905
+/subversion/trunk:876953
+/subversion/trunk/subversion/tests/cmdline/svntest/actions.py:836421-857791,869159-869165,869168-869181,869185,869188,869191,869200-869201,869203-869207,869209-869224,869227-869238,869240-869244,869248,869250-869260,869262-869263,869265,869267-869268,869272-869280,869282-869325,869328-869330,869335,869341-869347,869351,869354-869355,869358,869361-869377,869379-869381,869383-869417,869419-869422,869432-869453,869455-869466,869471-869473,869475,869483,869486,869488-869489,869491-869497,869499-869500,869503,869506-869508,869510-869521,869523-869540,869542-869552,869556,869558,869560-869561,869563,869565,869567,869570,869572,869582,869601-869602,869605,869607,869613-869614,869616,869618,869620,869625,869627,869630,869633,869639,869641-869643,869645-869652,869655,869657,869665,869668,869674,869677,869681,869685,869687-869688,869693,869697,869699-869700,869704-869708,869716,869719,869722,869724,869730,869733-869734,869737-869740,869745-869746,869751-869754,869766,869812-869813,869
815-869818,869820,869825,869837,869841,869843-869844,869858,869860-869861,869871,869875,869889,869895,869898,869902,869907,869909,869926,869928-869929,869931-869933,869942-869943,869950,869952,869957-869958,869969,869972,869974,869988,869994,869996,869999,870004,870013-870014,870016,870024,870032,870036,870039,870041-870043,870054,870060,870068-870071,870078,870083,870094,870104,870124,870127-870128,870133,870135-870136,870141,870144,870148,870160,870172,870175,870191,870198,870203-870204,870211,870219,870225,870233,870235-870236,870254-870255,870259,870307,870311,870313,870320,870323,870330-870331,870352-870353,870355,870359-870360,870371,870373,870378,870393-870395,870402,870409-870410,870414,870416,870421,870436,870442,870447,870449,870452,870454,870466,870476,870481-870483,870486,870500,870502,870505,870513-870518,870522-870523,870527,870529,870534,870536-870538,870540-870541,870543-870548,870554,870556,870561,870563,870584,870590-870592,870594-870595,870597,870618,87062
0,870622,870625-870626,870641,870647,870657,870665,870671,870681,870702-870703,870706-870708,870717-870718,870727,870737,870740,870742,870752,870758,870800,870809,870815,870817,870820-870825,870830,870835-870836,870850-870851,870853,870859,870861,870886,870894,870916-870918,870942,870945,870957,870962,870970,870979,870981,870989,870996,871003,871005,871009,871011,871023,871033,871035-871038,871041,871060,871078,871080,871092,871097,871099,871105,871107,871123,871130,871133-871135,871140,871149,871155-871156,871160,871162,871164,871181,871199-871200,871205,871211-871212,871215,871219,871225,871227,871229,871231,871236,871270,871273,871277,871283,871297,871302,871306,871308,871317,871320,871323-871325,871345,871347-871350,871354,871357,871361,871366,871374-871375,871377,871385-871388,871391,871408,871422,871443,871465,871467,871470,871472-871476,871481,871489,871499,871505,871508,871525-871527,871538,871542,871544,871547-871549,871556,871559,871562-871563,871578,871581,871590,
871597,871608,871620,871624,871649,871668,871675,871677,871693-871694,871696,871704,871732-871733,871744,871747,871759,871762,871766,871769,871793,871796,871799,871801,871811,871823,871831,871843,871860,871880,871891,871894,871899,871907,871911,871926,871933,871941-871942,871947-871949,871958,871974,872000-872001,872003,872018,872022,872038,872068,872086,872091,872093,872097,872103,872112,872130,872154,872216,872227,872234,872238,872243,872253,872255,872259,872261,872310-872311,872362,872416-872417,872429,872431,872434,872439,872483,872490-872491,872495,872515-872516,872518-872519,872522,872537,872541,872544,872565,872568,872571,872584,872596-872597,872612,872619,872632,872656,872670,872710,872713,872717,872746-872748,872777,872780-872782,872804,872813,872845,872864,872870,872872,872974,872981,872985-872987,873004,873042,873049,873051,873076,873087,873090,873096,873098,873100,873183,873186,873195,873210-873211,873247,873252,873259,873275,873286,873443,873521,873538-873539,87
3715,873718,873767,873778,873849,873856,873862,873914,873940,873947-873948,874048,874124-874125,874127,874156,874165,874168,874170,874245,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,874566,874568,874580,874619,874621,874634,874636,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060
Propchange: subversion/branches/1.5.x/www/images/subversion-diagram.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 21:09:27 2010
@@ -1,17 +1,17 @@
-subversion/branches/1.5.x-34184/www/images/subversion-diagram.png:874657-874741
-subversion/branches/1.5.x-34432/www/images/subversion-diagram.png:874744-874798
-subversion/branches/1.5.x-r30756/www/images/subversion-diagram.png:874853-874870
-subversion/branches/1.5.x-r31314/www/images/subversion-diagram.png:874476-874605
-subversion/branches/1.5.x-r34050-followups/www/images/subversion-diagram.png:874639-874686
-subversion/branches/1.5.x-r34487/www/images/subversion-diagram.png:874562-874581
-subversion/branches/1.5.x-r35566/www/images/subversion-diagram.png:875648-876172
-subversion/branches/1.5.x-r36256/www/images/subversion-diagram.png:876332-877824
-subversion/branches/1.5.x-r36613/www/images/subversion-diagram.png:876709-877827
-subversion/branches/1.5.x-r36879/www/images/subversion-diagram.png:876973-877829
-subversion/branches/1.5.x-r36919/www/images/subversion-diagram.png:876996-877831
-subversion/branches/1.5.x-r37156/www/images/subversion-diagram.png:877275-878306
-subversion/branches/1.5.x-r37169/www/images/subversion-diagram.png:877272-878304
-subversion/branches/1.5.x-rb-test-fix/www/images/subversion-diagram.png:874916-874919
-subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png:874586-874922
-subversion/trunk/MITTERS:876953
-subversion/trunk/www/images/subversion-diagram.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682
+/subversion/branches/1.5.x-34184/www/images/subversion-diagram.png:874657-874741
+/subversion/branches/1.5.x-34432/www/images/subversion-diagram.png:874744-874798
+/subversion/branches/1.5.x-r30756/www/images/subversion-diagram.png:874853-874870
+/subversion/branches/1.5.x-r31314/www/images/subversion-diagram.png:874476-874605
+/subversion/branches/1.5.x-r34050-followups/www/images/subversion-diagram.png:874639-874686
+/subversion/branches/1.5.x-r34487/www/images/subversion-diagram.png:874562-874581
+/subversion/branches/1.5.x-r35566/www/images/subversion-diagram.png:875648-876172
+/subversion/branches/1.5.x-r36256/www/images/subversion-diagram.png:876332-877824
+/subversion/branches/1.5.x-r36613/www/images/subversion-diagram.png:876709-877827
+/subversion/branches/1.5.x-r36879/www/images/subversion-diagram.png:876973-877829
+/subversion/branches/1.5.x-r36919/www/images/subversion-diagram.png:876996-877831
+/subversion/branches/1.5.x-r37156/www/images/subversion-diagram.png:877275-878306
+/subversion/branches/1.5.x-r37169/www/images/subversion-diagram.png:877272-878304
+/subversion/branches/1.5.x-rb-test-fix/www/images/subversion-diagram.png:874916-874919
+/subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion-diagram.png:874586-874922
+/subversion/trunk/MITTERS:876953
+/subversion/trunk/www/images/subversion-diagram.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060
Propchange: subversion/branches/1.5.x/www/images/subversion_logo-200x173.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 21:09:27 2010
@@ -1,17 +1,17 @@
-subversion/branches/1.5.x-34184/www/images/subversion_logo-200x173.png:874657-874741
-subversion/branches/1.5.x-34432/www/images/subversion_logo-200x173.png:874744-874798
-subversion/branches/1.5.x-r30756/www/images/subversion_logo-200x173.png:874853-874870
-subversion/branches/1.5.x-r31314/www/images/subversion_logo-200x173.png:874476-874605
-subversion/branches/1.5.x-r34050-followups/www/images/subversion_logo-200x173.png:874639-874686
-subversion/branches/1.5.x-r34487/www/images/subversion_logo-200x173.png:874562-874581
-subversion/branches/1.5.x-r35566/www/images/subversion_logo-200x173.png:875648-876172
-subversion/branches/1.5.x-r36256/www/images/subversion_logo-200x173.png:876332-877824
-subversion/branches/1.5.x-r36613/www/images/subversion_logo-200x173.png:876709-877827
-subversion/branches/1.5.x-r36879/www/images/subversion_logo-200x173.png:876973-877829
-subversion/branches/1.5.x-r36919/www/images/subversion_logo-200x173.png:876996-877831
-subversion/branches/1.5.x-r37156/www/images/subversion_logo-200x173.png:877275-878306
-subversion/branches/1.5.x-r37169/www/images/subversion_logo-200x173.png:877272-878304
-subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo-200x173.png:874916-874919
-subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png:874586-874922
-subversion/trunk/384x332.png:876953
-subversion/trunk/www/images/subversion_logo-200x173.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682
+/subversion/branches/1.5.x-34184/www/images/subversion_logo-200x173.png:874657-874741
+/subversion/branches/1.5.x-34432/www/images/subversion_logo-200x173.png:874744-874798
+/subversion/branches/1.5.x-r30756/www/images/subversion_logo-200x173.png:874853-874870
+/subversion/branches/1.5.x-r31314/www/images/subversion_logo-200x173.png:874476-874605
+/subversion/branches/1.5.x-r34050-followups/www/images/subversion_logo-200x173.png:874639-874686
+/subversion/branches/1.5.x-r34487/www/images/subversion_logo-200x173.png:874562-874581
+/subversion/branches/1.5.x-r35566/www/images/subversion_logo-200x173.png:875648-876172
+/subversion/branches/1.5.x-r36256/www/images/subversion_logo-200x173.png:876332-877824
+/subversion/branches/1.5.x-r36613/www/images/subversion_logo-200x173.png:876709-877827
+/subversion/branches/1.5.x-r36879/www/images/subversion_logo-200x173.png:876973-877829
+/subversion/branches/1.5.x-r36919/www/images/subversion_logo-200x173.png:876996-877831
+/subversion/branches/1.5.x-r37156/www/images/subversion_logo-200x173.png:877275-878306
+/subversion/branches/1.5.x-r37169/www/images/subversion_logo-200x173.png:877272-878304
+/subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo-200x173.png:874916-874919
+/subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-200x173.png:874586-874922
+/subversion/trunk/384x332.png:876953
+/subversion/trunk/www/images/subversion_logo-200x173.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060
Propchange: subversion/branches/1.5.x/www/images/subversion_logo-384x332.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 21:09:27 2010
@@ -1,16 +1,16 @@
-subversion/branches/1.5.x-34184/www/images/subversion_logo-384x332.png:874657-874741
-subversion/branches/1.5.x-34432/www/images/subversion_logo-384x332.png:874744-874798
-subversion/branches/1.5.x-r30756/www/images/subversion_logo-384x332.png:874853-874870
-subversion/branches/1.5.x-r31314/www/images/subversion_logo-384x332.png:874476-874605
-subversion/branches/1.5.x-r34050-followups/www/images/subversion_logo-384x332.png:874639-874686
-subversion/branches/1.5.x-r34487/www/images/subversion_logo-384x332.png:874562-874581
-subversion/branches/1.5.x-r35566/www/images/subversion_logo-384x332.png:875648-876172
-subversion/branches/1.5.x-r36256/www/images/subversion_logo-384x332.png:876332-877824
-subversion/branches/1.5.x-r36613/www/images/subversion_logo-384x332.png:876709-877827
-subversion/branches/1.5.x-r36879/www/images/subversion_logo-384x332.png:876973-877829
-subversion/branches/1.5.x-r36919/www/images/subversion_logo-384x332.png:876996-877831
-subversion/branches/1.5.x-r37156/www/images/subversion_logo-384x332.png:877275-878306
-subversion/branches/1.5.x-r37169/www/images/subversion_logo-384x332.png:877272-878304
-subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo-384x332.png:874916-874919
-subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png:874586-874922
-subversion/trunk/www/images/subversion_logo-384x332.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682
+/subversion/branches/1.5.x-34184/www/images/subversion_logo-384x332.png:874657-874741
+/subversion/branches/1.5.x-34432/www/images/subversion_logo-384x332.png:874744-874798
+/subversion/branches/1.5.x-r30756/www/images/subversion_logo-384x332.png:874853-874870
+/subversion/branches/1.5.x-r31314/www/images/subversion_logo-384x332.png:874476-874605
+/subversion/branches/1.5.x-r34050-followups/www/images/subversion_logo-384x332.png:874639-874686
+/subversion/branches/1.5.x-r34487/www/images/subversion_logo-384x332.png:874562-874581
+/subversion/branches/1.5.x-r35566/www/images/subversion_logo-384x332.png:875648-876172
+/subversion/branches/1.5.x-r36256/www/images/subversion_logo-384x332.png:876332-877824
+/subversion/branches/1.5.x-r36613/www/images/subversion_logo-384x332.png:876709-877827
+/subversion/branches/1.5.x-r36879/www/images/subversion_logo-384x332.png:876973-877829
+/subversion/branches/1.5.x-r36919/www/images/subversion_logo-384x332.png:876996-877831
+/subversion/branches/1.5.x-r37156/www/images/subversion_logo-384x332.png:877275-878306
+/subversion/branches/1.5.x-r37169/www/images/subversion_logo-384x332.png:877272-878304
+/subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo-384x332.png:874916-874919
+/subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo-384x332.png:874586-874922
+/subversion/trunk/www/images/subversion_logo-384x332.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060
Propchange: subversion/branches/1.5.x/www/images/subversion_logo_hor-468x64.png
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 21:09:27 2010
@@ -1,17 +1,17 @@
-subversion/branches/1.5.x-34184/www/images/subversion_logo_hor-468x64.png:874657-874741
-subversion/branches/1.5.x-34432/www/images/subversion_logo_hor-468x64.png:874744-874798
-subversion/branches/1.5.x-r30756/www/images/subversion_logo_hor-468x64.png:874853-874870
-subversion/branches/1.5.x-r31314/www/images/subversion_logo_hor-468x64.png:874476-874605
-subversion/branches/1.5.x-r34050-followups/www/images/subversion_logo_hor-468x64.png:874639-874686
-subversion/branches/1.5.x-r34487/www/images/subversion_logo_hor-468x64.png:874562-874581
-subversion/branches/1.5.x-r35566/www/images/subversion_logo_hor-468x64.png:875648-876172
-subversion/branches/1.5.x-r36256/www/images/subversion_logo_hor-468x64.png:876332-877824
-subversion/branches/1.5.x-r36613/www/images/subversion_logo_hor-468x64.png:876709-877827
-subversion/branches/1.5.x-r36879/www/images/subversion_logo_hor-468x64.png:876973-877829
-subversion/branches/1.5.x-r36919/www/images/subversion_logo_hor-468x64.png:876996-877831
-subversion/branches/1.5.x-r37156/www/images/subversion_logo_hor-468x64.png:877275-878306
-subversion/branches/1.5.x-r37169/www/images/subversion_logo_hor-468x64.png:877272-878304
-subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo_hor-468x64.png:874916-874919
-subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png:874586-874922
-subversion/trunk:876953
-subversion/trunk/www/images/subversion_logo_hor-468x64.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682
+/subversion/branches/1.5.x-34184/www/images/subversion_logo_hor-468x64.png:874657-874741
+/subversion/branches/1.5.x-34432/www/images/subversion_logo_hor-468x64.png:874744-874798
+/subversion/branches/1.5.x-r30756/www/images/subversion_logo_hor-468x64.png:874853-874870
+/subversion/branches/1.5.x-r31314/www/images/subversion_logo_hor-468x64.png:874476-874605
+/subversion/branches/1.5.x-r34050-followups/www/images/subversion_logo_hor-468x64.png:874639-874686
+/subversion/branches/1.5.x-r34487/www/images/subversion_logo_hor-468x64.png:874562-874581
+/subversion/branches/1.5.x-r35566/www/images/subversion_logo_hor-468x64.png:875648-876172
+/subversion/branches/1.5.x-r36256/www/images/subversion_logo_hor-468x64.png:876332-877824
+/subversion/branches/1.5.x-r36613/www/images/subversion_logo_hor-468x64.png:876709-877827
+/subversion/branches/1.5.x-r36879/www/images/subversion_logo_hor-468x64.png:876973-877829
+/subversion/branches/1.5.x-r36919/www/images/subversion_logo_hor-468x64.png:876996-877831
+/subversion/branches/1.5.x-r37156/www/images/subversion_logo_hor-468x64.png:877275-878306
+/subversion/branches/1.5.x-r37169/www/images/subversion_logo_hor-468x64.png:877272-878304
+/subversion/branches/1.5.x-rb-test-fix/www/images/subversion_logo_hor-468x64.png:874916-874919
+/subversion/branches/1.5.x-reintegrate-improvements/www/images/subversion_logo_hor-468x64.png:874586-874922
+/subversion/trunk:876953
+/subversion/trunk/www/images/subversion_logo_hor-468x64.png:836421-867703,870331,870830,871467,872522,872981,872987,873004,873098,873100,873849,873856,873862,873940,874156,874165,874168,874170,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874566,874568,874580,874619,874621,874634,874636,874659,874727,874730,874743,874806,874816,874848,874868,874888,874896,874909,874912,874949,874993,874998,875114,875217,875219,875324,875360,875371,875441,875540,875590,875640,875786-875787,875807,876004,876055,876170-876171,876212,876233,876330,876687,876689,876705,876715,876857,876934,876993,877191,877230,877243,877459,877720,877730,878673,878682,1000038,1000060