Re: [Fofredux-devel] Devs assigned

[Kevin <ke...@dr...>]

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.