From: Andrew T. <ajt...@hi...> - 2005-11-27 16:46:40
|
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 Andy On 11/27/05, Kevin <ke...@dr...> wrote: > Benjamin Stewart wrote: > > >Do we have plans for code reviewing going forward? Like, here's my > >diff, here are comments from someone else, dev responds to comments, > >changes made, and done? > > > >Here's what I've found works really well when working with branches in > >cvs: > > > >1. once you're ready to submit, make a LIST of your files. > >2. add a tag PRE_CHECKINLABEL to ONLY those files (using your list) > >3. check in > >4. add a tag PRE_CR_CHECKINLABEL (Code Review) to ONLY those files > >5. make changes as appropriate for the CR and check in again and get CR > >approval > >6. add a tag POST_CHECKINLABEL to ONLY those files > > > >This way, you can double -j when merging those changes around based on > >the tags, and you're not relying on cvs's insane file versions, and the > >pre cr tag allows you to back a change out a lot easier. And I *think* > >the reason to only tag your specific files is because it makes it easier > >to figure out what files are changed by any given change, though I'm not > >sure that's it -- whatever it was, we had a really good reaosn for that > >policy (and I don't think it was just that some of my fellow engineers > >were idiots and I didn't trust them not to check in all of their global > >changes if they weren't using file lists). > > > > > > > It looks like a good idea for major enhancements or code > refactoring.(like tags, for instance) For those of us with less CVS > experience, could you give examples of what cvs commands are run at each > step? > > Thanks, > Kevin > > > > ------------------------------------------------------- > 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/ |