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

Re: svn commit: r1294566 - /subversion/branches/1.7.x/STATUS

From: Greg Stein <gstein_at_gmail.com>
Date: Tue, 28 Feb 2012 19:55:13 -0500

Looks like this got pulled out in a later STATUS update. I'm assuming
the group merges fine without my change?

(it may be handy to merge anyways, to avoid potential future merge conflicts)

On Tue, Feb 28, 2012 at 05:43, <danielsh_at_apache.org> wrote:
> Author: danielsh
> Date: Tue Feb 28 10:43:21 2012
> New Revision: 1294566
>
> URL: http://svn.apache.org/viewvc?rev=1294566&view=rev
> Log:
> * STATUS: Predict that gstein's cosmetic fix will be required, too.
>
> Modified:
>    subversion/branches/1.7.x/STATUS
>
> Modified: subversion/branches/1.7.x/STATUS
> URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1294566&r1=1294565&r2=1294566&view=diff
> ==============================================================================
> --- subversion/branches/1.7.x/STATUS (original)
> +++ subversion/branches/1.7.x/STATUS Tue Feb 28 10:43:21 2012
> @@ -61,7 +61,7 @@ Candidate changes:
>      +1: stsp, rhuijben
>
>  * r1293945, r1293972, r1293976, r1293998, r1294136, r1294236;
> -   r1294134, r1294147
> +   r1294134, r1294147, r1294364, rXXX
>    Two interdependent changes:
>    Fix issue #4121: copy followed by delete of unreadable child.
>    Fix svn:// authz in Python tests.
> @@ -76,6 +76,8 @@ Candidate changes:
>    Notes:
>      r1294134 extends a test to demonstrate its brokenness.
>      r1294147 fixes said brokenness.
> +     r1294364 is included to avoid conflicts with rXXX.
> +     rXXX fixes r1294147 for Windows.
>    Votes:
>      +1: danielsh
>
>
>
Received on 2012-02-29 01:55:48 CET

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