philip_at_apache.org wrote on Thu, Sep 22, 2011 at 13:56:04 -0000:
> Author: philip
> Date: Thu Sep 22 13:56:03 2011
> New Revision: 1174142
>
> URL: http://svn.apache.org/viewvc?rev=1174142&view=rev
> Log:
> * STATUS: Propose r1174111 (with danielsh via IRC).
>
> 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=1174142&r1=1174141&r2=1174142&view=diff
> ==============================================================================
> --- subversion/branches/1.7.x/STATUS (original)
> +++ subversion/branches/1.7.x/STATUS Thu Sep 22 13:56:03 2011
> @@ -124,6 +124,15 @@ Candidate changes:
> API and client/server protocol)
> +0: danielsh (I didn't review merge_tests.py or merge.c changes)
>
> + * r1174111
> + Use the correct function to copy repositories in the testsuite.
> + Justification:
> + Prevent occassional test failure.
> + Notes:
> + Merge conflict on externals_tests.py resolved with --accept mf.
> + Votes:
> + +1: philip, danielsh
> +
I'd prefer to have the backport entry merge only basic_tests.py, rather
than merge from /trunk and then resolve conflicts. The mergeinfo then
won't imply that the externals_tests.py portion of r1174111 had been
merged.
> Veto-blocked changes:
> =====================
>
>
>
Received on 2011-09-22 17:44:04 CEST