You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2012/09/10 15:14:51 UTC

Re: svn commit: r1382806 - /subversion/branches/1.6.x/STATUS

cmpilato@apache.org wrote on Mon, Sep 10, 2012 at 12:52:32 -0000:
> Author: cmpilato
> Date: Mon Sep 10 12:52:32 2012
> New Revision: 1382806
> 
> URL: http://svn.apache.org/viewvc?rev=1382806&view=rev
> Log:
> On the '1.6.x' branch:
> 
> * STATUS
>   (r1338810 group): Add r1339154, resolving danielsh's suggestion to
>     do so, and boldly assuming that philip would +1 the obvious
>     additional fix.  This approves the change.
>   (r1330410 group, r1088602 group): Vote affirmatively, approving.

The r1338810 and r1088602 groups conflict and cannot be merged by the
script --- manual intervention is required.