Woops, guess I wasn't clear enough first time.
Branching is a bit more heavy-duty than the method I was proposing. I
meant to have, in parallel to lib and src (etc) a proposal directory, in
the current branch of CVS. The code in the proposal directory would not
be built automatically, you would move it into src if you wanted to try
it. This avoids branching for every proposal. This is similar to the
organisation within Avalon's main branch.
If we need to branch to bug-fix a release, we could do that now, but we
could wait until we needed to and then do a retroactive branch. (Which
is how we unearthed the version of avalon used in James).
Does that make more sense?
Charles
Serge Knystautas wrote:
>
> ----- Original Message -----
> From: "Charles Benett" <[EMAIL PROTECTED]>
> To: "James - Java Apache Mail Server" <[EMAIL PROTECTED]>
> Sent: Wednesday, August 30, 2000 4:26 AM
> Subject: Proposal subtree in cvs
>
> > Hi!
> > I suggest we add a proposal subtree in CVS for code we are working on
> > that involves changes to the main source. In my case, I suspect that the
> > IMAP work (future) will impact the LDAP user repository, so I'd keep
> > both in the User Rep stuff in proposal until IMAP is also stable.
> > I think the rule should be:
> > 1) code in main src must compile and execute at all times;
> > 2) code in proposal must compile at all times.
> > There could be subtrees for each mini-project.
> > This also allows other developers a chance to look at new code before it
> > is inflicted/ committed into the main tree.
> > Comments?
> > Charles
>
> I agree all branches in CVS should compile, but I'm not sure whether it's
> best to branch on version released or to branch on proposals. Maybe the new
> User Rep stuff is going to take long enough to stick it in a separate
> branch, but should the work I'm doing to separate the mailet.jar (and about
> to commit) be on the main branch or in a proposal?
>
> We haven't already but I would recommend we fork branch a branch when we
> make a release (make a branch for 1.1 right now) so that as the tree moves
> forward, you can make patches to that version rather than just requiring the
> user to upgrade to the latest version number.
>
> Assuming we do branch proposals, what are the steps we have to take to get
> approved to merge to the main branch?
>
> Serge Knystautas
> Loki Technologies
> http://www.lokitech.com/
>
> ------------------------------------------------------------
> To subscribe: [EMAIL PROTECTED]
> To unsubscribe: [EMAIL PROTECTED]
> Archives: <http://www.mail-archive.com/james%40list.working-dogs.com/>
> Problems?: [EMAIL PROTECTED]
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Archives: <http://www.mail-archive.com/james%40list.working-dogs.com/>
Problems?: [EMAIL PROTECTED]
