subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Julian Foad <julianf...@btopenworld.com>
Subject Re: svn commit: r1643189 - in /subversion/branches/1.7.x: ./ subversion/ subversion/include/svn_repos.h subversion/libsvn_repos/load-fs-vtable.c subversion/tests/libsvn_repos/repos-test.c subversion/tests/svn_test.h
Date Tue, 09 Dec 2014 11:16:14 GMT
Ben Reser wrote:
> With careful effort of stefan2 and myself we've reverted this.  It was
> mistakenly merged onto the 1.7.x branch not the 1.7.x-r1643074 branch.

Ouch. Thank you very much for unpicking my mistake. This is at least the third backport-related
thing I've got wrong recently :-(

> Not only that but the merge it says it's doing is not what it did, it was
> actually a merge of r1643119 on 1.8.x-r1643074.

Actually the change merged was the right logical change (r1643074 from trunk), merged indirectly.
I decided the best way to merge the required change was indirectly from the 1.8.x backport
branch, because most or all of the adjustments needed for 1.7.x were already made in the 1.8.x
backport. I should have explained that in the log message, but I forgot.

(In the diff quoted below I have elided a lot of the common context so you can see the mergeinfo
diff says it's a merge of both 1.8.x-r1643074:1643119 and trunk:1643074.)

> I found this only because the merge broke the swig-rb on 1.7.x during testing
> for the 1.7.19 release.

> Huge thanks to stefan2 for helping me fix this.

Thanks to both of you.

- Julian


> On 12/5/14 12:25 AM, julianfoad@apache.org wrote:
>>  Author: julianfoad
>>  Date: Fri Dec  5 08:25:52 2014
>>  New Revision: 1643189
>> 
>>  URL: http://svn.apache.org/viewvc?rev=1643189&view=rev
>>  Log:
>>  On the '1.7.x-r1643074' branch: merge r1643074 from trunk.
>> 
>>  Modified:
>>      subversion/branches/1.7.x/   (props changed)
>>      subversion/branches/1.7.x/subversion/   (props changed)
>>      subversion/branches/1.7.x/subversion/include/svn_repos.h
>>      subversion/branches/1.7.x/subversion/libsvn_repos/load-fs-vtable.c
>>      subversion/branches/1.7.x/subversion/tests/libsvn_repos/repos-test.c (contents,
props changed)
>>      subversion/branches/1.7.x/subversion/tests/svn_test.h
>> 
>>  Propchange: subversion/branches/1.7.x/
>> ------------------------------------------------------------------------------
>>  --- svn:mergeinfo (original)
>>  +++ svn:mergeinfo Fri Dec  5 08:25:52 2014
>>  @@ -96,6 +96,7 @@
>> +/subversion/branches/1.8.x-r1643074:1643119
>>  @@ -151,4 +152,4 @@
>> -/subversion/trunk:1146013,1146121,[...],1640730,1641564
>> +/subversion/trunk:1146013,1146121,[...],1640730,1641564,1643074


Mime
View raw message