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

Re: svn commit: r39166 - branches/1.6.x

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 8 Sep 2009 10:13:59 +0200

On Mon, Sep 07, 2009 at 09:16:59AM -0700, Stephen Butler wrote:
> Author: sbutler
> Date: Mon Sep 7 09:16:59 2009
> New Revision: 39166
>
> Log:
> On the 1.6.x branch:
>
> * STATUS: Update the r38000 group and vote for it.

When adding additional revisions and voting for them, you should mark
existing votes as not having voted for the revisions you've added yet.
See below.

> ==============================================================================
> --- branches/1.6.x/STATUS Mon Sep 7 08:55:16 2009 (r39165)
> +++ branches/1.6.x/STATUS Mon Sep 7 09:16:59 2009 (r39166)
> @@ -98,7 +98,8 @@ Candidate changes:
> +1: pburba
>
> * r38000, r38006, r38099, r38100, r38181, r38803, r38841, r38896,
> - r38907, r39000, r39002, r39007, r39008, r39052
> + r38907, r39000, r39002, r39007, r39008, r39052, r39096, r39124,
> + r39235, r39127
> Properly handle tree conflicts during replace.
> Justification:
> If a merge has a delete followed by an add on the same node, and
> @@ -114,12 +115,12 @@ Candidate changes:
> Since some of these revisions revert or change edits from earlier
> ones, it makes more sense to review the diff of the branch rather
> than all the individual changes:
> - svn diff -x-p ^/branches/1.6.x_at_39009 ^/branches/1.6.x-r38000
> + svn diff -x-p ^/branches/1.6.x ^/branches/1.6.x-r38000
> See the log messages on the branch as well as those on trunk.
> Branch:
> ^/branches/1.6.x-r38000
> Votes:
> - +1: stsp
> + +1: stsp, sbutler

I.e. this should be something like:

+1: sbutler
+1: stsp (without r39096, r39124, r39235, r39127)

Once I have time to review the additional revisions I'll upgrade
my vote to a full +1.

Stefan

> -1: julianfoad (r38000, r38006, r38099, r38100, r38181 only)
>
> * r35958, r36030, r38373, r38836, r38837, r38842
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=2392016

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2392279
Received on 2009-09-08 10:15:48 CEST

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