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 2011/10/10 21:39:30 UTC
svn commit: r1181166 - in /subversion/branches/1.5.x: ./ STATUS
subversion/mod_dav_svn/repos.c
Author: hwright
Date: Mon Oct 10 19:39:30 2011
New Revision: 1181166
URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
Log:
* STATUS: Note the deletion rev of a few old branches, in case folks wish
to resurrect them some day.
Modified:
subversion/branches/1.5.x/ (props changed)
subversion/branches/1.5.x/STATUS
subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
Propchange: subversion/branches/1.5.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 10 19:39:30 2011
@@ -35,4 +35,4 @@
/subversion/branches/reintegrate-improvements:873853-874164
/subversion/branches/svn-mergeinfo-enhancements:870196
/subversion/branches/svnpatch-diff:871905
-/subversion/trunk: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,869837,869841,869843-869844,86985
8,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,871597,871608,871620,871624,871649,871668,871675,871677,87
1693-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,873849,873856,873862,873914,8739
40,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,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,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,877842,878673,878682,879293,880082,880162,880450,1000038,1000060,1022675,1032808,1033166,1038163,1041083,1041438
+/subversion/trunk: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,869837,869841,869843-869844,86985
8,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,871597,871608,871620,871624,871649,871668,871675,871677,87
1693-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,873849,873856,873862,873914,8739
40,873947-873948,874124-874125,874127,874156,874165,874168,874170,874245,874258,874270,874318,874330,874380,874405,874459,874467,874497,874506,874561,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,876097,876170-876171,876212,876233,876330,876687,876689,876705,876715,876804,876840,876849,876857,876934,876953,876993,877191,877230,877243,877459,877720,877730,877842,878673,878682,879293,880082,880162,880450,1000038,1000060,1022675,1032808,1033166,1038163,1041083,1041438,1098608
Modified: subversion/branches/1.5.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/STATUS?rev=1181166&r1=1181165&r2=1181166&view=diff
==============================================================================
--- subversion/branches/1.5.x/STATUS (original)
+++ subversion/branches/1.5.x/STATUS Mon Oct 10 19:39:30 2011
@@ -1,6 +1,6 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * *
* *
- * THIS RELEASE STREAM IS OPEN TO BUG FIXES. *
+ * THIS RELEASE STREAM IS CLOSED TO FURTHER CHANGES. *
* *
* * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -59,6 +59,7 @@ Candidate changes for 1.5.10:
r877146 is a test for the issue, r877157 is the fix.
Branch:
^/subversion/branches/1.5.x-issue3392
+ (This branch was removed from HEAD in r1181163.)
Votes:
+1: pburba, arfrever
@@ -69,9 +70,10 @@ Candidate changes for 1.5.10:
from 2Gb+ of RAM to under 400Mb is a very good thing.
Notes
The merge conflicts in a few places due to some minor cleanups
- performed post-1.5.x. A backport branch resolving it can be
- found here:
+ performed post-1.5.x.
+ Branch:
http://svn.collab.net/repos/svn/branches/1.5.x-r37137
+ (This branch was removed from HEAD in r1181163.)
Votes:
+1: cmpilato, arfrever
@@ -80,10 +82,9 @@ Candidate changes for 1.5.10:
Justification:
Not common, but a segfault is a segfault. See
http://svn.haxx.se/dev/archive-2009-05/0363.shtml.
- Notes:
- There are text conflicts in both merge.c and merge_tests.py, a
- backport branch resolving these can be found at:
+ Branch:
http://svn.collab.net/repos/svn/branches/1.5.x-r37779.
+ (This branch was removed from HEAD in r1181163.)
Votes:
+1: pburba
@@ -120,6 +121,7 @@ Candidate changes for 1.5.10:
to mergeinfo-test.c clearly demonstrate the bug.
Branch:
^/branches/1.5.x-r39109
+ (This branch was removed from HEAD in r1181163.)
Votes:
+1: pburba, hwright
@@ -131,6 +133,7 @@ Candidate changes for 1.5.10:
Fixes an uninitialized variable that can result in a segfault.
Branch:
^/branches/1.5.x-r902467
+ (This branch was removed from HEAD in r1181163.)
Votes:
+1: pburba
Modified: subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c?rev=1181166&r1=1181165&r2=1181166&view=diff
==============================================================================
--- subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c Mon Oct 10 19:39:30 2011
@@ -2649,10 +2649,11 @@ deliver(const dav_resource *resource, ap
apr_status_t status;
/* Check resource type */
- if (resource->type != DAV_RESOURCE_TYPE_REGULAR
- && resource->type != DAV_RESOURCE_TYPE_VERSION
- && resource->type != DAV_RESOURCE_TYPE_WORKING
- && resource->info->restype != DAV_SVN_RESTYPE_PARENTPATH_COLLECTION)
+ if (resource->baselined
+ || (resource->type != DAV_RESOURCE_TYPE_REGULAR
+ && resource->type != DAV_RESOURCE_TYPE_VERSION
+ && resource->type != DAV_RESOURCE_TYPE_WORKING
+ && resource->info->restype != DAV_SVN_RESTYPE_PARENTPATH_COLLECTION))
{
return dav_new_error(resource->pool, HTTP_CONFLICT, 0,
"Cannot GET this type of resource.");
Re: svn commit: r1181166 - in /subversion/branches/1.5.x: ./
STATUS subversion/mod_dav_svn/repos.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Hyrum K Wright wrote on Tue, Oct 11, 2011 at 10:08:21 -0300:
> On Mon, Oct 10, 2011 at 7:20 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> > hwright@apache.org wrote on Mon, Oct 10, 2011 at 19:39:30 -0000:
> >> Author: hwright
> >> Date: Mon Oct 10 19:39:30 2011
> >> New Revision: 1181166
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
> >> Log:
> >> * STATUS: Note the deletion rev of a few old branches, in case folks wish
> >> to resurrect them some day.
> >>
> >> Modified:
> >> subversion/branches/1.5.x/ (props changed)
> >> subversion/branches/1.5.x/STATUS
> >> subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
> >>
> >> Propchange: subversion/branches/1.5.x/
> >> ------------------------------------------------------------------------------
> >> --- svn:mergeinfo (original)
> >> +++ svn:mergeinfo Mon Oct 10 19:39:30 2011
> >> @@ -35,4 +35,4 @@
> >> /subversion/branches/reintegrate-improvements:873853-874164
> >> /subversion/branches/svn-mergeinfo-enhancements:870196
> >> /subversion/branches/svnpatch-diff:871905
> >> -/subversion/trunk:1041438
> >> +/subversion/trunk:1041438,1098608
> >
> > This mergeinfo change has not been reverted.
>
> Done in r1181768 (I think). If something else is amiss there, I'm out
> of my league attempting to fix it.
Looks good to me. Thanks.
Re: svn commit: r1181166 - in /subversion/branches/1.5.x: ./
STATUS subversion/mod_dav_svn/repos.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Hyrum K Wright wrote on Tue, Oct 11, 2011 at 10:08:21 -0300:
> On Mon, Oct 10, 2011 at 7:20 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> > hwright@apache.org wrote on Mon, Oct 10, 2011 at 19:39:30 -0000:
> >> Author: hwright
> >> Date: Mon Oct 10 19:39:30 2011
> >> New Revision: 1181166
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
> >> Log:
> >> * STATUS: Note the deletion rev of a few old branches, in case folks wish
> >> to resurrect them some day.
> >>
> >> Modified:
> >> subversion/branches/1.5.x/ (props changed)
> >> subversion/branches/1.5.x/STATUS
> >> subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
> >>
> >> Propchange: subversion/branches/1.5.x/
> >> ------------------------------------------------------------------------------
> >> --- svn:mergeinfo (original)
> >> +++ svn:mergeinfo Mon Oct 10 19:39:30 2011
> >> @@ -35,4 +35,4 @@
> >> /subversion/branches/reintegrate-improvements:873853-874164
> >> /subversion/branches/svn-mergeinfo-enhancements:870196
> >> /subversion/branches/svnpatch-diff:871905
> >> -/subversion/trunk:1041438
> >> +/subversion/trunk:1041438,1098608
> >
> > This mergeinfo change has not been reverted.
>
> Done in r1181768 (I think). If something else is amiss there, I'm out
> of my league attempting to fix it.
Looks good to me. Thanks.
Re: svn commit: r1181166 - in /subversion/branches/1.5.x: ./ STATUS subversion/mod_dav_svn/repos.c
Posted by Hyrum K Wright <hy...@wandisco.com>.
On Mon, Oct 10, 2011 at 7:20 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> hwright@apache.org wrote on Mon, Oct 10, 2011 at 19:39:30 -0000:
>> Author: hwright
>> Date: Mon Oct 10 19:39:30 2011
>> New Revision: 1181166
>>
>> URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
>> Log:
>> * STATUS: Note the deletion rev of a few old branches, in case folks wish
>> to resurrect them some day.
>>
>> Modified:
>> subversion/branches/1.5.x/ (props changed)
>> subversion/branches/1.5.x/STATUS
>> subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
>>
>> Propchange: subversion/branches/1.5.x/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Mon Oct 10 19:39:30 2011
>> @@ -35,4 +35,4 @@
>> /subversion/branches/reintegrate-improvements:873853-874164
>> /subversion/branches/svn-mergeinfo-enhancements:870196
>> /subversion/branches/svnpatch-diff:871905
>> -/subversion/trunk:1041438
>> +/subversion/trunk:1041438,1098608
>
> This mergeinfo change has not been reverted.
Done in r1181768 (I think). If something else is amiss there, I'm out
of my league attempting to fix it.
-Hyrum
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Re: svn commit: r1181166 - in /subversion/branches/1.5.x: ./ STATUS subversion/mod_dav_svn/repos.c
Posted by Hyrum K Wright <hy...@wandisco.com>.
On Mon, Oct 10, 2011 at 7:20 PM, Daniel Shahaf <d....@daniel.shahaf.name> wrote:
> hwright@apache.org wrote on Mon, Oct 10, 2011 at 19:39:30 -0000:
>> Author: hwright
>> Date: Mon Oct 10 19:39:30 2011
>> New Revision: 1181166
>>
>> URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
>> Log:
>> * STATUS: Note the deletion rev of a few old branches, in case folks wish
>> to resurrect them some day.
>>
>> Modified:
>> subversion/branches/1.5.x/ (props changed)
>> subversion/branches/1.5.x/STATUS
>> subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
>>
>> Propchange: subversion/branches/1.5.x/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Mon Oct 10 19:39:30 2011
>> @@ -35,4 +35,4 @@
>> /subversion/branches/reintegrate-improvements:873853-874164
>> /subversion/branches/svn-mergeinfo-enhancements:870196
>> /subversion/branches/svnpatch-diff:871905
>> -/subversion/trunk:1041438
>> +/subversion/trunk:1041438,1098608
>
> This mergeinfo change has not been reverted.
Done in r1181768 (I think). If something else is amiss there, I'm out
of my league attempting to fix it.
-Hyrum
--
uberSVN: Apache Subversion Made Easy
http://www.uberSVN.com/
Re: svn commit: r1181166 - in /subversion/branches/1.5.x: ./
STATUS subversion/mod_dav_svn/repos.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hwright@apache.org wrote on Mon, Oct 10, 2011 at 19:39:30 -0000:
> Author: hwright
> Date: Mon Oct 10 19:39:30 2011
> New Revision: 1181166
>
> URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
> Log:
> * STATUS: Note the deletion rev of a few old branches, in case folks wish
> to resurrect them some day.
>
> Modified:
> subversion/branches/1.5.x/ (props changed)
> subversion/branches/1.5.x/STATUS
> subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
>
> Propchange: subversion/branches/1.5.x/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Oct 10 19:39:30 2011
> @@ -35,4 +35,4 @@
> /subversion/branches/reintegrate-improvements:873853-874164
> /subversion/branches/svn-mergeinfo-enhancements:870196
> /subversion/branches/svnpatch-diff:871905
> -/subversion/trunk:1041438
> +/subversion/trunk:1041438,1098608
This mergeinfo change has not been reverted.
Re: svn commit: r1181166 - in /subversion/branches/1.5.x: ./
STATUS subversion/mod_dav_svn/repos.c
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
hwright@apache.org wrote on Mon, Oct 10, 2011 at 19:39:30 -0000:
> Author: hwright
> Date: Mon Oct 10 19:39:30 2011
> New Revision: 1181166
>
> URL: http://svn.apache.org/viewvc?rev=1181166&view=rev
> Log:
> * STATUS: Note the deletion rev of a few old branches, in case folks wish
> to resurrect them some day.
>
> Modified:
> subversion/branches/1.5.x/ (props changed)
> subversion/branches/1.5.x/STATUS
> subversion/branches/1.5.x/subversion/mod_dav_svn/repos.c
>
> Propchange: subversion/branches/1.5.x/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Oct 10 19:39:30 2011
> @@ -35,4 +35,4 @@
> /subversion/branches/reintegrate-improvements:873853-874164
> /subversion/branches/svn-mergeinfo-enhancements:870196
> /subversion/branches/svnpatch-diff:871905
> -/subversion/trunk:1041438
> +/subversion/trunk:1041438,1098608
This mergeinfo change has not been reverted.