Rafal Krzewski wrote:
>
> The ongoing work on the Security system came to a point where
> it's no longer possible to gradually check in system without
> making the tree non-functional. We need to have version
> control on these files and collaborate (right now the
> the work is done in a joint effort of people from e-point
> and CollabNet) but we certainly don't want to make the
> tree broken for all the people who use it.
>
> This make brought me to the conclusion that we need to
> create a cvs branch. We didn't do that before in Turbine,
> so I feel in position to establish a standard to follow
> whenever we need to perform such an action in the future.
+1
> After reading into the CVSBOOK earlier today I would like
> to propose that we use 'flying fish' approach to branching.
> We sprout a branch, make a modifications, and when they are
> good to be checked into the trunk we do the merge, and then
> never use the branch again, to avoid maintenance problems.
> When we need to branch again we create another branch.
> I suggest we'd use the following naming scheme:
That's <http://cvsbook.red-bean.com/>, btw.
> The name of the branch is composed of a name describing
> the subject being worked on, followed by an underscore
> and a two digit number used to distinguish multiple branches
> for the same subject.
>
> Actual tag names are then
> <subject>_<number>-sprout for marking the revision of the
> trunk where the branch diverged
> <subject>_<number>-branch for the branch itself
> <subject>_<number>-merge for marking the revision of the
> trunk with changes made on the branch merged in
>
> I'm going to create branch named 'security_01' for coordination
> of ongoing work.
Excellent--this looks like it will address our situation perfectly.
> I'll be coordinating the work on the branch, and will merge
> in the changes when we are ready.
> I'd like to ask all the developers to refrain from checking
> in modifications to any security related classes in the
> trunk, instead e-mail your suggestion/patches to me.
>
> For those wishing to observe the development of security code,
> here is how you can gain access to the branch sources:
> go to a directory where you want to have the snapshot and run:
>
> cvs checkout -d turbine-security -r security_01-branch turbine
>
> You must have the CVSROOT variable set up the same way as
> you use for usually accessing Turbine CVS.
Thank you for researching and setting this up, Rafal.
> If you don't understand all the stuff that is written above,
> don't worry. This is to save *you* trouble :). You can update
> turbine as usually, and when the changes are done, you'll se
> them as a single update to numerous files. That's all.
Hehehehe, yup.
--
Daniel Rall <[EMAIL PROTECTED]>
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Search: <http://www.mail-archive.com/turbine%40list.working-dogs.com/>
Problems?: [EMAIL PROTECTED]
