Re: [Openjnlp-devel] A new version wants to be released

[Kevin H. <ke...@na...>]

On Friday, June 14, 2002, at 04:38 PM, Christopher Heiny wrote:

> On Friday 14 June 2002 11:53 am, Kevin Herrboldt wrote:
[...]
> Sounds like a practical plan to me.  I'll follow this next time I'm 
> folding
> in new functionality (for example, Elvis or (possibly) System.err 
> handling).

Oh no, I think I wasn't clear. When doing new stuff, keep doing it on 
the main trunk. When it's time to feature freeze for a release, the 
frozen code will go on a new branch.

I don't want releases to interfere with adding new features and it 
really reduces headaches for developers if they can keep working on the 
main trunk.

> Do you have any preferred branch naming convention?

I'm planning to document the CVS structure and maybe even include a 
visual aid. My plan now is to stick with the naming convention for 
releases ("ver-0-6" for example). Releases will most likely go like this 
(using "ver-0-7" as an example release):

   bp_ver-0-7      on the trunk as a tag to denote where the branch point 
is
   branch_ver-0-7  branch created from the "bp_ver-0-7" point
   ver-0-7         on the branch as a tag for the release actually 
released
   mp_ver-0-7      on the trunk as a tag to denote where the branch was 
merged back (merge point)

If there's a bug fix for a specific release it will be done on the 
branch for that version and then released as a minor point release. So 
"ver-0-7-1" would be a tag on "branch_ver-0-7" and there would be a 
"mp_ver-0-7-1" merge point on the main trunk to roll the fixes back into 
the main code base.