Hi All:
I am a cvs expert and would like to referr you to the following
branching patterns assembled by Brad, et al:
http://www.cmcrossroads.com/bradapp/acme/branching/
Using these patterns, I have effectively managed projects
in the past. The ones I recommend for CVS are:
Branching Policy:
Deferred Branching
Codeline Conventions
http://www.cmcrossroads.com/bradapp/acme/branching/branch-policy.html#Deferr
edBranching
http://www.cmcrossroads.com/bradapp/acme/branching/branch-policy.html#Codeli
neConventions
Branch Creation:
Codeline per Major Release
http://www.cmcrossroads.com/bradapp/acme/branching/branch-creation.html#Code
linePerMajorRelease
Branch Structure:
LAG Development Line
Parallel Releasing/Development Lines
http://www.cmcrossroads.com/bradapp/acme/branching/branch-structs.html#LagLi
ne
http://www.cmcrossroads.com/bradapp/acme/branching/branch-structs.html#Paral
lelRelEngDev
With this said, what we do is this:
Mainline proj-1-0-branch
================ ================
proj-1-0-build-1
proj-1-0-build-2
proj-1-0-build-3 == proj-1-0-base <== release candidate (pob)
proj-1-0-build-4
proj-1-0-build-5 <== formal release (document)
proj-1-1-build-1 ^- map: cvs-tag:
proj-1-0-build-5
proj-1-1-build-2 rel-tag: proj-1-0
...etc...
rtag'n and tag'n are basically the same; they just create a tag
in the repository. However, you really should use plain old "tag"
when you identify the stable builds. Reason: you just validated
that the source in your workspace builds correctly; if you try
to do an rtag instead, you risk someone checking into the HEAD
and you will be tagging an unverified build-set.
rtag'n should be reserved to those times when you want
to create a branch off an _existing_ tag. There is
no reason to rtag the HEAD unless you have a very
small development group.
hth,
-- Tom.
PS> Please note that Activity Branches and Branch per Task just cause
massive headaches with CVS
http://www.cmcrossroads.com/bradapp/acme/branching/line-elems.html#ActivityB
ranch
http://www.cmcrossroads.com/bradapp/acme/branching/branch-creation.html#Bran
chPerTask
> -----Original Message-----
> From: Ian MacLean [mailto:[EMAIL PROTECTED]
> Sent: Friday, November 21, 2003 1:10 AM
> To: Scott Hernandez
> Cc: [EMAIL PROTECTED]
> Subject: Re: [nant-dev] NAnt Tag and Branch policies
>
>
> From my reading of the docs they are not orthogonal. ie when you are
> satisfied that the source is in a releasable state then you add the
> rtags so you can always get that version at a later date. Branching
> however gives you a seperate dev line which enables you to polish a
> release while still making changes to the main branch. If you
> choose not
> to branch and the release process takes any length of time
> then all the
> commits waiting to go onto the main line have to be queued up. If a
> branch is made the sources should still be rtagged on that
> branch prior
> to release - its not really an either/or situation.
>
> see: http://www.kagekaze.org/cvs/cvs-talk/releng/tags.html
>
> Ian
>
> >
> >I'm not a cvs expert, but it seems like we are not doing
> this correctly
> >if we create a branch before we make a release. We should be
> rtag'n and
> >not branch'n.
> >
> >----- Original Message -----
> >From: "Clayton Harbour" <[EMAIL PROTECTED]>
> >To: "Scott Hernandez" <[EMAIL PROTECTED]>;
> ><[EMAIL PROTECTED]>
> >Sent: Wednesday, November 12, 2003 7:43 PM
> >Subject: RE: [nant-dev] NAnt Tag and Branch policies
> >
> >
> >
> >
>
>
>
>
> -------------------------------------------------------
> This SF.net email is sponsored by: SF.net Giveback Program.
> Does SourceForge.net help you be more productive? Does it
> help you create better code? SHARE THE LOVE, and help us
> help YOU! Click Here: http://sourceforge.net/donate/
> _______________________________________________
> nant-developers mailing list [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/nant-developers
>
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
nant-developers mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/nant-developers
