Re: [Fofredux-devel] Devs assigned

[Andrew T. (nilspace) <nil...@us...>]

Branches and tags are different, but related, things.

Tags are used to mark a specific revision of files, or more
importantly, the repository. For example, we will probably tag
Release-0_2, RC-0_3, etc. THis allows Devs & Users to go and get a
specific tag/release of code using the name.

A Branch is like a fork in the code. A dev may want to go and work on
a bunch of changes, be able to check those changes in, work with other
devs, etc. But not "mess up" HEAD. Therefore, they will create a
branch (BRANCH_AJAX). A branch can have it's own tags. At some point a
branch can come back to the HEAD, or it can always just be a branch
and you can merge files to the branch or from the branch to the HEAD.


Andrew


On 11/27/05, Kevin <ke...@dr...> wrote:
> Andrew Turner wrote:
>
> >Well, to check what's changed in your CVS do:
> >
> >cvs -n up
> >
> >U : updated in CVS
> >M : local copy changed
> >P : differences in local copy to CVS copy (needs to merge)
> >C : conflict - merged into local copy - you need to search the local
> >copy and resolve the code between the <<<< and >>>>> flags
> >
> >You can also check out this:
> >http://ximbiot.com/cvs/cvshome/docs/blandy.html
> >or
> >http://www.cvsnt.org/manual/html/Modifying-tags.html
> >
> >or grab MacCVS or WinCVS which are decent GUI's for CVS.
> >
> >I guess I can see the benefit of doing this kind of tagging. FoFRedux
> >is a rather small codebase (which is good - let's keep it that way)
> >which can mean a lot more conflicts occuring with overlapping code.
> >This may be a reason Steve M. originally kept the project to himself.
> >
> >Anyways, I guess you are suggesting:
> >PRE_ADDEDTAGS
> >PRE_CR_ADDEDTAGS
> >POST_ADDEDTAGS
> >
> >as an example? Perhaps use LABELS from a marked Feature Request, Bug,
> >Support, from Sourceforge. Make sure and put what LABEL is used in the
> >Sourceforge bug notes
> >
> >therefore, you would:
> >1) update before any modifications (-d adds any new directories)
> >  cvs up -d
> >2) modify code
> >3) Check for what files you modified
> >  cvs -n up
> >2) Tag now as pre-mod
> >  cvs tag PRE_ADDEDTAGS index.php init.php
> >3) commit modifications
> >  cvs commit index.php init.php
> >4) Tag Code Review (whole repository?)
> >  cvs tag PRE_CR_ADDEDTAGS
> >5) Wait for others to verify modifications
> >6) Tag
> >  cvs tag POST_ADDEDTAGS
> >
> >
> Okay.  I understand it a bit better.  It's all done with revision tags,
> but my checkins are against the HEAD branch.
>
>
>
> -------------------------------------------------------
> This SF.net email is sponsored by: Splunk Inc. Do you grep through log fi=
les
> for problems?  Stop!  Download the new AJAX search engine that makes
> searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
> http://ads.osdn.com/?ad_id=3D7637&alloc_id=3D16865&op=3Dclick
> _______________________________________________
> Fofredux-devel mailing list
> Fof...@li...
> https://lists.sourceforge.net/lists/listinfo/fofredux-devel
>


--
Andrew Turner
ajt...@hi...        42.4266N x 83.4931W
http://highearthorbit.com              Northville, Michigan, USA
idealistic technocrat

Photos - http://flickr.com/photos/ajturner
Travel   - http://highearthorbit.com/projects/location/