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

Re: svn commit: r33696 - branches/1.5.x

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 17 Oct 2008 11:28:12 -0700

Should we yank 1.5.3 and publish a 1.5.4 right away?

If this is a regression, then it seems we ought to pop out a 1.5.4 right away.

Cheers,
-g

On Thu, Oct 16, 2008 at 7:37 AM, <pburba_at_tigris.org> wrote:
> Author: pburba
> Date: Thu Oct 16 07:37:52 2008
> New Revision: 33696
>
> Log:
> * STATUS: Nominate r33693.
>
> Modified:
> branches/1.5.x/STATUS
>
> Modified: branches/1.5.x/STATUS
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/STATUS?pathrev=33696&r1=33695&r2=33696
> ==============================================================================
> --- branches/1.5.x/STATUS Thu Oct 16 07:24:21 2008 (r33695)
> +++ branches/1.5.x/STATUS Thu Oct 16 07:37:52 2008 (r33696)
> @@ -56,5 +56,18 @@ Candidate changes for 1.5.4:
> Votes:
> +1: pburba
>
> + * r33693
> + Fix merge bug introduced in the backport of the r29969, r32463, r33013,
> + r33016, r33022, r33112 group in 1.5.3.
> + Notes:
> + There is a minor whitespace conflict in merge.c.
> + Justification:
> + This bug is a regression in 1.5.3, breaks mergeinfo aware merges when
> + ecountered, and has already been seen a couple times in our own repos,
> + see http://subversion.tigris.org/servlets/ReadMsg?list=dev&&msgNo=144187
> + and http://subversion.tigris.org/issues/show_bug.cgi?id=3294#desc1.
> + Votes:
> + +1: pburba
> +
> Approved changes:
> =================
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: svn-help_at_subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-10-17 20:28:27 CEST

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