[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Stop backport.pl running as cronjob? (was Re: svn commit: r1764631 - /subversion/branches/1.9.x-r1721488/)

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Fri, 21 Oct 2016 12:18:41 +0200

Great, thanks Daniel!

-- 
Johan
On Fri, Oct 21, 2016 at 1:45 AM, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
> Daniel Shahaf wrote on Thu, Oct 13, 2016 at 14:57:16 +0000:
>> [[[
>> backport.py: Fix a race condition involving concurrent commits to STATUS
>> (see r1764633).
>>
>> The fix is to run 'update' at the top of the outermost loop, rather than
>> immediately before calling 'svn merge'.
>>
>> * tools/dist/backport/merger.py
>>   (merge): Don't run revert+update; instead, expect the caller to have done so.
>>
>> * tools/dist/merge-approved-backports.py:
>>     Run 'update' and re-parse STATUS before each merge.
>>
>> * tools/dist/detect-conflicting-backports.py:
>>     Track API change of merge().
>> ]]]
>
> Committed in r1765903.
Received on 2016-10-21 12:19:09 CEST

This is an archived mail posted to the Subversion Dev mailing list.