Re: Re: [Webwork-devel] Branch or Commit , which?

[matt b. <mat...@ho...>]

For now, I vote to have two modules (core, examples). You could argue 
another module (contrib). But, I think we should wait and see if it still 
makes sense after refactoring into two modules first. I also think we should 
establish a branch/release policy. So, here goes a draft to bat around.

CVS proposal:
- The mainline should be used for current development. Some people prefer to 
only use the mainline for receiving stables bases but this would be 
confusing for people used to checking out the latest code from the mainline. 
So the mainline is the LAG (latest and greatest).
- Branches off the LAG are created for major work and merged back in when it 
is stable. This should be used for major refactoring or other significant 
work. You should tag with root_of_??? where ??? is your change label. The 
branch should be labeled ???_branch. This keeps you from having to hoard 
everything local.
- Other releases ahead of the mainline should be branched. For instance, to 
begin work on 1.1, a branch should be created off the mainline labeled 
dev_1_1. When 1.0 is released, 1.1 branch should be merged into the 
mainline.
- For releases, a tag should be created to snapshot the code. So for 1.0, a 
tag of root_of_1_0 will be created. Any future patches should be worked on a 
branch and appropriate code changes merged into the mainline.

Mechanics of branching and merging:
- Create a tag on the root of the mainline and label it root_of_dev_x_x
- Create a branch on the root of the mainline and label it dev_x_x

-Matt

>
>To: "web...@li..." 
><web...@li...>
>Subject: Re: [Webwork-devel] Branch or Commit , which?
>From: Mike Cannon-Brookes <mi...@at...>
>Date: Tue, 05 Feb 2002 00:45:41 +1100
>
>On 5/2/02 12:24 AM, "Victor Salaman" (vsa...@ho...) penned the
>words:
>
> > Hi Rickard and fellow webworkers:
> >
> > I have a ton of things I would like to commit but have been reluctant to 
>do
> > so since I don't want to add new features before 1.0 as this release has 
>to
> > be extremely stable and throughly tested. And although the stuff I'll be
> > committing has been used in production as of a month ago with no 
>problems
> > whatsoever, I'd like it to be tested by the community before it goes
> > mainstream.
> >
> > Now my question is:
> >
> > 1. Should we make some kind of "sandbox" inside webwork cvs? (for this 
>and
> > future additions)
> > 2. Should we create another module in cvs (for tools relating to 
>webwork).
> > 3. Should I just commit and get it over with (least desired option)?
> >
> > What are your opinions?
>
>I vote #2.
>
>Has any thought been given to splitting up WW slightly post 1.0, with the
>parts that relate to other technologies made into separate modules (ie
>Velocity integration, formproc).
>
>It's quite possible this would enable:
>- modules to have separate release schedules to WW core (which is very slow
>are releasing - but it's OSS so we can't complain ;))
>- the core to be simplified (hopefully?) and dependencies removed
>
>Thoughts?
>
>-mike
>
>
>_______________________________________________
>Webwork-devel mailing list
>Web...@li...
>https://lists.sourceforge.net/lists/listinfo/webwork-devel
>
>------- End of forwarded message -------
>
>


_________________________________________________________________
Send and receive Hotmail on your mobile device: http://mobile.msn.com