Great, thanks Daniel! -- Johan
On Fri, Oct 21, 2016 at 1:45 AM, Daniel Shahaf <d...@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.
