Mark Phippard <markphip_at_gmail.com> writes:
> Make an rc6 soon so that we can give it a couple weeks before release?
? Well, that doesn't really address the question I'm asking... We
already have a date on which to roll rc6, and while I've no objection to
adding an extra week to its soak time, I don't think it's really
necessary either.
The question is just what changes to include in rc6. For example, I'd
be very happy for 1.5.x-r31159-r31179 branch changes (merged in r31218)
to simply wait until 1.5.1. That way they'd get a full soak in a later
RC, and of course testing on trunk as well that whole time.
Regarding the other two changesets I listed (merged in r31186 and
r31185), a good plan would be for us to figure out what harm would come
from letting them wait until 1.5.1. If we decide they can wait, then
IMHO they should; if we decide they really need to be in in 1.5.0, let's
at least give give them extra review, so that on top of the one-week
soak they've had more brain time as well.
> Sent from my iPhone
:-)
-Karl
> On May 17, 2008, at 7:34 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
>
>> "Hyrum K. Wright" <hyrum_wright_at_mail.utexas.edu> writes:
>>> Hi all. We're almost halfway through the 4-week soak period for
>>> rc5. There have been several minor items merged to the 1.5.x branch,
>>> but overall, it looks like we're on track for release during the
>>> first
>>> week of June (*knock on wood*).
>>>
>>> [...]
>>> [http://subversion.tigris.org/hacking.html#release-stabilization]
>>> [...]
>>>
>>> RC 5 was released on May 5, so I plan on rolling and posting the next
>>> (and hopefully final!) release candidate on May 23-24. If all goes
>>> well, whatever makes it into that RC will be in 1.5.0-final; they
>>> will
>>> share the same magic revision. Fixes which don't make it into RC 6
>>> will be postponed to 1.5.1, which I anticipate releases 1-2 months
>>> after 1.5.0, pending demand.
>>
>> Below are all the changes that have been ported to the 1.5.x branch
>> since 1.5.0-rc5 came out. I think a few of them are questionable for
>> inclusion in a one-week soak (that is, I've no complaints about the
>> changes themselves, I just think they might be a bit complex to be
>> released with undergoing full soak).
>>
>> Of course, the fact that they were merged into 1.5.x is fine, no
>> objection there. The question is merely whether we make the final RC
>> (and thence 1.5.0 itself) off the tip of the 1.5.x branch or off the
>> 1.5.0-rc5 tag. In the former case, we automatically get all the
>> changes
>> below; in the latter case, we pick which changes we want to re-merge,
>> and anything below that doesn't get re-merged ends up in 1.5.1 anyway.
>>
>> Just to be clear: I am *not* proposing that any soak times be
>> extended.
>> The ship date should not be affected by any of this; I'm just asking
>> about what should be included in the release when it happens.
>>
>> Search for "### THOUGHTS? ###" below to see which merges look to me
>> like
>> they might want more than one week of soak. There should be only
>> three:
>> r31218, r31186, r31185.
>>
>> ---
>> ---------------------------------------------------------------------
>> r31218 | cmpilato | 2008-05-15 15:58:42 -0400 (Thu, 15 May 2008) |
>> 16 lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/libsvn_wc/merge.c
>> M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py
>>
>> Merge from trunk this change group:
>>
>> ### THOUGHTS? ###
>>
>> * (r31159, r31179) or r31193 from 1.5.x-r31159-r31179 branch.
>> Fix "file not found" error when a merge target is a broken
>> symbolic link.
>> Notes:
>> r31179 just makes sure the new test is skipped on Windows.
>> r31193 from 1.5.x-r31159-r31179 branch has r31159 and r31179
>> merged to it with a conflict resolution.
>> Votes:
>> +1: kfogel(r31159, r31179), kameshj, cmpilato (r31159, r31179)
>>
>> Also:
>>
>> * STATUS
>> Remove the group.
>>
>> ---
>> ---------------------------------------------------------------------
>> r31216 | cmpilato | 2008-05-15 15:40:26 -0400 (Thu, 15 May 2008) |
>> 16 lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/include/svn_repos.h
>> M /branches/1.5.x/subversion/libsvn_repos/fs-wrap.c
>> M /branches/1.5.x/subversion/tests/cmdline/prop_tests.py
>>
>> Merge this change group from trunk:
>>
>> * r31138, r31141, r31157, r31209
>> Validate svn:date property values in libsvn_repos.
>> Notes:
>> r31141 is a docstring change.
>> r31157 marks the regression test XFail over DAV.
>> r31209 is a teeny typo (read: obvious) fix
>> Votes:
>> +1: danielsh, kfogel, cmpilato
>>
>> Also:
>>
>> * STATUS
>> Remove the group.
>>
>> ---
>> ---------------------------------------------------------------------
>> r31186 | hwright | 2008-05-15 00:00:53 -0400 (Thu, 15 May 2008) | 14
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/libsvn_client/merge.c
>> M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py
>>
>> Merge r30746, r30747 from trunk:
>>
>> ### THOUGHTS? ###
>>
>> * r30746, r30747
>> Fix a minor merge range notification header bug.
>> Notes:
>> r30747 is just cleanup of some cruft that snuck in with r30746,
>> thus adhering to my "every commit should need a follow-up" ethos.
>> r30746 contains, like, one tiny *real* change, then a whole bunch
>> of bogus indentation changes that were supposed to be part of
>> r30748. Probably best to not fix that indentation during
>> backport, in case we later backport r30748.
>> Votes:
>> +1: pburba, markphip, cmpilato
>>
>> ---
>> ---------------------------------------------------------------------
>> r31185 | hwright | 2008-05-14 23:59:12 -0400 (Wed, 14 May 2008) | 8
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/libsvn_client/merge.c
>> M /branches/1.5.x/subversion/libsvn_client/mergeinfo.c
>> M /branches/1.5.x/subversion/libsvn_client/mergeinfo.h
>> M /branches/1.5.x/subversion/tests/cmdline/merge_tests.py
>>
>> Merge r30949, r30962 from trunk:
>>
>> ### THOUGHTS? ###
>>
>> * r30949, r30962
>> Fix issue #3188. Mergeinfo on switched targets/subtrees should
>> elide
>> to repos.
>> Votes:
>> +1: pburba, markphip, cmpilato
>>
>> ---
>> ---------------------------------------------------------------------
>> r31184 | hwright | 2008-05-14 23:57:18 -0400 (Wed, 14 May 2008) | 7
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/build.conf
>> M /branches/1.5.x/subversion/bindings/swig
>>
>> Merge r31056 from trunk:
>>
>> * r31056
>> Enable svn.diff in swig-py on Windows.
>> Votes:
>> +1: epg, arfrever, cmpilato
>>
>> ---
>> ---------------------------------------------------------------------
>> r31183 | hwright | 2008-05-14 23:56:17 -0400 (Wed, 14 May 2008) | 10
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/include/svn_client.h
>> M /branches/1.5.x/subversion/libsvn_client/add.c
>>
>> Merge r31131 from trunk:
>>
>> * r31131
>> Restore compatibility of svn_client_add3()'s non-recursive behavior.
>> Notes:
>> This fixes an API incompatibility. But in practice it's a minor
>> problem, and could probably wait until 1.5.1 if necessary.
>> Votes:
>> +1: kfogel, epg, cmpilato
>>
>> ---
>> ---------------------------------------------------------------------
>> r31182 | hwright | 2008-05-14 23:53:40 -0400 (Wed, 14 May 2008) | 7
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/libsvn_subr/path.c
>> M /branches/1.5.x/subversion/tests/libsvn_subr/path-test.c
>>
>> Merge r31162 from trunk:
>>
>> * r31162
>> Fix an OBOE in svn_path_splitext().
>> Votes:
>> +1: cmpilato, kfogel, danielsh
>>
>> ---
>> ---------------------------------------------------------------------
>> r31164 | hwright | 2008-05-14 10:44:27 -0400 (Wed, 14 May 2008) | 9
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/contrib/client-side/svnmerge/svnmerge-migrate-
>> history.py
>> M /branches/1.5.x/contrib/client-side/svnmerge/svnmerge-migrate-
>> test.sh
>> M /branches/1.5.x/subversion/bindings/swig
>>
>> Merge r31081, r31082, r31153, r31155 from trunk:
>>
>> * r31081, r31082, r31153, r31155
>> Various improvements to svnmerge-migrate-history.py for dealing
>> with the kinds of problems caused by svnmerge.py's total ignorance
>> of object history.
>> Votes:
>> +1: cmpilato, dlr
>>
>> ---
>> ---------------------------------------------------------------------
>> r31150 | hwright | 2008-05-13 00:54:47 -0400 (Tue, 13 May 2008) | 10
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/libsvn_ra_serf/log.c
>>
>> Merge r31125 from trunk:
>>
>> * r31125
>> Fix circular dependency between libsvn_ra and libsvn_ra_serf by
>> teaching
>> libsvn_ra_serf to call svn_ra_serf__has_capability directly.
>> Justification:
>> Trivial fix. Necessary for cygwin build.
>> Votes:
>> +1: djames, lgo, danielsh
>>
>> ---
>> ---------------------------------------------------------------------
>> r31149 | hwright | 2008-05-13 00:53:43 -0400 (Tue, 13 May 2008) | 10
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/libsvn_ra/compat.c
>>
>> Merge r31126 from trunk:
>>
>> * r31126
>> Use 'void *' to avoid compile warnings and eliminate casts.
>> Justification:
>> Trivial fix. Allows clean build with EXTRA_CFLAGS='-Wall
>> -Wno-uninitialized -Wdeclaration-after-statement -Werror'
>> Votes:
>> +1: djames, kfogel, lgo
>>
>> ---
>> ---------------------------------------------------------------------
>> r31148 | hwright | 2008-05-13 00:51:24 -0400 (Tue, 13 May 2008) | 12
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/bindings/swig/python/libsvn_swig_py/
>> swigutil_py.c
>>
>> Merge r31145 from trunk:
>>
>> * r31145
>> Fix memory leaks in Python bindings.
>> Justification:
>> Memory leaks are bad.
>> Notes:
>> Depends on r31055 and r31066 (see above)
>> Votes:
>> +1: djames
>> +0: epg
>>
>> ---
>> ---------------------------------------------------------------------
>> r31147 | hwright | 2008-05-13 00:50:16 -0400 (Tue, 13 May 2008) | 12
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/bindings/swig
>> M /branches/1.5.x/subversion/bindings/swig/python/libsvn_swig_py/
>> swigutil_py.c
>> M /branches/1.5.x/subversion/bindings/swig/python/libsvn_swig_py/
>> swigutil_py.h
>> M /branches/1.5.x/subversion/bindings/swig/python/svn/wc.py
>> M /branches/1.5.x/subversion/bindings/swig/python/tests/wc.py
>> M /branches/1.5.x/subversion/bindings/swig/svn_wc.i
>>
>> Merge r31055, r31066 from trunk:
>>
>> * r31055 (subversion/bindings/swig), r31066
>> Make svn_wc_diff_callbacks2_t work in Python (not a new interface,
>> it was just broken for Python until r31055).
>> Notes:
>> 'svn merge -c 31055 ^/trunk/subversion/bindings/swig
>> subversion/bindings/swig' cleanly merges the Python change.
>> Votes:
>> +1: epg
>> +0: djames
>>
>> ---
>> ---------------------------------------------------------------------
>> r31114 | hwright | 2008-05-09 10:47:36 -0400 (Fri, 09 May 2008) | 7
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/libsvn_ra_serf/serf.c
>>
>> Merge r31107 from trunk:
>>
>> * r31107
>> ra_serf: Fix API bug when fetched_rev is non-NULL and revision is
>> invalid.
>> Votes:
>> +1: epg, jerenkrantz, kfogel
>>
>> ---
>> ---------------------------------------------------------------------
>> r31112 | cauchy | 2008-05-09 05:11:12 -0400 (Fri, 09 May 2008) | 4
>> lines
>> Changed paths:
>> M /branches/1.5.x/subversion/po/zh_CN.po
>>
>> Simplified chinese translation update.
>>
>> * subversion/po/zh_CN.po: translate new backport strings.
>>
>> ---
>> ---------------------------------------------------------------------
>> r31074 | hwright | 2008-05-07 15:50:04 -0400 (Wed, 07 May 2008) | 7
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/libsvn_fs_base/fs.c
>>
>> Merge r31049 from trunk:
>>
>> * r31049
>> s/lock-nodes/lock-tokens/ in a message.
>> Votes:
>> +1: arfrever, danielsh, hwright
>>
>> ---
>> ---------------------------------------------------------------------
>> r31073 | hwright | 2008-05-07 15:48:12 -0400 (Wed, 07 May 2008) | 7
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/include/svn_io.h
>>
>> Merge r31031 from trunk:
>>
>> * r31031
>> Match svn_io_check_path's docstring to its implementation.
>> Votes:
>> +1: danielsh, arfrever, hwright
>>
>> ---
>> ---------------------------------------------------------------------
>> r31071 | hwright | 2008-05-07 15:44:08 -0400 (Wed, 07 May 2008) | 7
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/include/svn_error_codes.h
>>
>> Merge r31025 from trunk:
>>
>> * r31025
>> Fix the SVN_ERR_AUTHN_CREDS_NOT_SAVED message.
>> Votes:
>> +1: arfrever, danielsh, hwright
>>
>> ---
>> ---------------------------------------------------------------------
>> r31065 | hwright | 2008-05-07 14:59:49 -0400 (Wed, 07 May 2008) | 10
>> lines
>> Changed paths:
>> M /branches/1.5.x
>> M /branches/1.5.x/CHANGES
>> M /branches/1.5.x/COMMITTERS
>> M /branches/1.5.x/STATUS
>> M /branches/1.5.x/subversion/include/svn_ra.h
>>
>> Merge r31018 from trunk:
>>
>> * r31018
>> Fix svn_ra_open3() doc string to say "@since 1.5" not "@since 1.6".
>> Notes: This falls into hacking.html's no-vote-necessary category.
>> Since I'm nominating it anyway, I'll record my vote, but I'm
>> just filing it directly in the Approved section.
>> Votes:
>> +1: kfogel, danielsh
>>
>> ---
>> ---------------------------------------------------------------------
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
>> For additional commands, e-mail: dev-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-05-18 02:49:22 CEST