On Wed, Mar 17, 2010 at 00:23, Daryl C. W. O'Shea
<spamassas...@dostech.ca> wrote:
> On 16/03/2010 10:36 AM, Justin Mason wrote:
>> On Tue, Mar 16, 2010 at 12:52, Justin Mason <j...@jmason.org> wrote:
>>> For long term use, though, we'll need some way to cut a rules tarball
>>> using what's in SVN right now, rather than what was there on the previous
>>> night.   in my opinion it's unsafe to risk differences between what's
>>> live in svn and what we're releasing, particularly if changes went in
>>> during that window.
>>>
>>> We can, of course, use the scores that were generated then (but with
>>> changes since then included too).
>>
>> simple way to do this -- can we just SVN merge from trunk/rules back
>> to 3.3/rules?
>> that'd be quite elegant and easy to do.
>
> I'm not sure what we're really merging in this scenario.  If we're not
> going to maintain more than one set of rules (ie. no back-porting, which
> I think you agreed with previously today) is there any benefit to
> essentially just creating a copy of the rules directory?

The benefit is that when we tag a release, we'll also be tagging a
ruleset known to work with that release.  We also allow the test suite
to test against that ruleset in SVN.  It simplifies the build scripts
(I think).

> If there is, I
> think it's a little more complicated than just merging rules/.

indeed, we may need to "svn rm" / "svn cp" the directory instead
of attempting to merge it.

-- 
--j.

Reply via email to