You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by Will Glass-Husain <wg...@forio.com> on 2005/06/26 08:12:03 UTC
branching strategy?
Hi,
Does anyone understand the Velocity branches in svn?
We have a VEL_1_5_BRANCH. What does this mean since there has been no
released 1.5 version. Note that a recent bug contributor has checked this
out and found an old version of the code. Should we delete this or am I
missing something?
See the comment in the bug report here:
http://issues.apache.org/bugzilla/show_bug.cgi?id=35504
There's also a branch "jv" which I don't understand either.
WILL
_______________________________________
Forio Business Simulations
Will Glass-Husain
wglass@forio.com
www.forio.com
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: branching strategy?
Posted by Claude Brisson <cl...@renegat.net>.
On Sat, 2005-06-25 at 23:12 -0700, Will Glass-Husain wrote:
> Hi,
>
> Does anyone understand the Velocity branches in svn?
>
> We have a VEL_1_5_BRANCH. What does this mean since there has been no
> released 1.5 version. Note that a recent bug contributor has checked this
> out and found an old version of the code. Should we delete this or am I
> missing something?
I agree with you, there shouldn't be any 1.5 branch before the release
is out
--
Claude
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: branching strategy?
Posted by Will Glass-Husain <wg...@forio.com>.
Thanks Jason, that's probably a good idea.
WILL
----- Original Message -----
From: "Jason van Zyl" <ja...@maven.org>
To: "Velocity Developers List" <ve...@jakarta.apache.org>
Sent: Friday, July 01, 2005 5:59 PM
Subject: Re: branching strategy?
> On Thu, 2005-06-30 at 01:29 -0700, Daniel L. Rall wrote:
>
>> Dunno, perhaps a "Jason van Zyl" branch? What's the date on it, and who
>> created it? The relevant information should be available from 'svn log
>> URL_TO_BRANCH'.
>
> I think I kept most of my IoC Velocity and compiler experiments out of
> the repository.
>
> For that matter the one compiler class that exists can be removed and
> the dependency on BCEL removed.
>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
>> For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
>>
>>
> --
> jvz.
>
> Jason van Zyl
> jason at maven.org
> http://maven.apache.org
>
> First, the taking in of scattered particulars under one Idea,
> so that everyone understands what is being talked about ... Second,
> the separation of the Idea into parts, by dividing it at the joints,
> as nature directs, not breaking any limb in half as a bad carver might.
>
> -- Plato, Phaedrus (Notes on the Synthesis of Form by C. Alexander)
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: branching strategy?
Posted by Jason van Zyl <ja...@maven.org>.
On Thu, 2005-06-30 at 01:29 -0700, Daniel L. Rall wrote:
> Dunno, perhaps a "Jason van Zyl" branch? What's the date on it, and who
> created it? The relevant information should be available from 'svn log
> URL_TO_BRANCH'.
I think I kept most of my IoC Velocity and compiler experiments out of
the repository.
For that matter the one compiler class that exists can be removed and
the dependency on BCEL removed.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
>
>
--
jvz.
Jason van Zyl
jason at maven.org
http://maven.apache.org
First, the taking in of scattered particulars under one Idea,
so that everyone understands what is being talked about ... Second,
the separation of the Idea into parts, by dividing it at the joints,
as nature directs, not breaking any limb in half as a bad carver might.
-- Plato, Phaedrus (Notes on the Synthesis of Form by C. Alexander)
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: branching strategy?
Posted by Daniel Rall <dl...@finemaltcoding.com>.
On Thu, 2005-06-30 at 10:48 -0700, Will Glass-Husain wrote:
...
> The branch "jv" was created in 2000 by Jason van Zyl, and seems to not have
> ever had any commits. A personal branch (the only one), never used, created
> 5 years ago but a former committer not currently actively involved. Think
> it's ok to delete?
The fact that it's had no commits and age are reason enough to delete
it, +1.
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: branching strategy?
Posted by Will Glass-Husain <wg...@forio.com>.
Ok, I'm going to delete branch 1.5, since I think this is confusing. I'll
wait 2 days for any objections.
The branch "jv" was created in 2000 by Jason van Zyl, and seems to not have
ever had any commits. A personal branch (the only one), never used, created
5 years ago but a former committer not currently actively involved. Think
it's ok to delete?
WILL
----- Original Message -----
From: "Daniel L. Rall" <dl...@finemaltcoding.com>
To: "Velocity Developers List" <ve...@jakarta.apache.org>
Sent: Thursday, June 30, 2005 1:29 AM
Subject: Re: branching strategy?
> On Sat, 2005-06-25 at 23:12 -0700, Will Glass-Husain wrote:
>> Hi,
>>
>> Does anyone understand the Velocity branches in svn?
>>
>> We have a VEL_1_5_BRANCH. What does this mean since there has been no
>> released 1.5 version. Note that a recent bug contributor has checked
>> this
>> out and found an old version of the code. Should we delete this or am I
>> missing something?
>>
>> See the comment in the bug report here:
>> http://issues.apache.org/bugzilla/show_bug.cgi?id=35504
>
> This was probably a stabilization branch, which is completely reasonable
> to create before a release is cut (it's a tag which can't be created
> before a release is made). I seem to recall some features being slated
> for 2.0 rather than 1.5 which were committed to HEAD. Though, if it's
> all being dumped into 1.5, I don't see any problem with doing 'svn rm'
> -- if something important was in there, it'll always be in Subversion
> history, so could be retrieved if necessary.
>
> (I'm offline ATM, so can't verify the diffs between branches, but that
> would be my suggested approach for verification.)
>
>> There's also a branch "jv" which I don't understand either.
>
> Dunno, perhaps a "Jason van Zyl" branch? What's the date on it, and who
> created it? The relevant information should be available from 'svn log
> URL_TO_BRANCH'.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org
Re: branching strategy?
Posted by "Daniel L. Rall" <dl...@finemaltcoding.com>.
On Sat, 2005-06-25 at 23:12 -0700, Will Glass-Husain wrote:
> Hi,
>
> Does anyone understand the Velocity branches in svn?
>
> We have a VEL_1_5_BRANCH. What does this mean since there has been no
> released 1.5 version. Note that a recent bug contributor has checked this
> out and found an old version of the code. Should we delete this or am I
> missing something?
>
> See the comment in the bug report here:
> http://issues.apache.org/bugzilla/show_bug.cgi?id=35504
This was probably a stabilization branch, which is completely reasonable
to create before a release is cut (it's a tag which can't be created
before a release is made). I seem to recall some features being slated
for 2.0 rather than 1.5 which were committed to HEAD. Though, if it's
all being dumped into 1.5, I don't see any problem with doing 'svn rm'
-- if something important was in there, it'll always be in Subversion
history, so could be retrieved if necessary.
(I'm offline ATM, so can't verify the diffs between branches, but that
would be my suggested approach for verification.)
> There's also a branch "jv" which I don't understand either.
Dunno, perhaps a "Jason van Zyl" branch? What's the date on it, and who
created it? The relevant information should be available from 'svn log
URL_TO_BRANCH'.
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org