[PLUG] CVS branching question

Anderson, Rob (Global Trade) Rob.Anderson at nike.com
Wed Mar 10 17:03:02 UTC 2004


The stickyness applies to file that have already been branched. After you branch the new file the stickyness will apply to that file as well.

-Rob Anderson

> -----Original Message-----
> From: plug-admin at lists.pdxlinux.org
> [mailto:plug-admin at lists.pdxlinux.org]On Behalf Of
> gilmanhunt at comcast.net
> Sent: Wednesday, March 10, 2004 4:53 PM
> To: plug at lists.pdxlinux.org
> Subject: [PLUG] CVS branching question
> 
> 
> I'm working at my new job, happily slaving away for the man, 
> when he asks me to check out a module from the cvs 
> repository. So I do. Then he asks me to make it a branch of 
> my very own. So I do. Following the instructions in this cvs 
> document...
> 
> http://www.loria.fr/~molli/cvs/doc/cvs_toc.html
> and specifically this section:
> http://www.loria.fr/~molli/cvs/doc/cvs_5.html#SEC51
> 
> The docs say that this "branch creation" is sticky; and so I 
> won't need to play with it until we merge again. However, 
> I've created a new file and added it (cvs add filename) to 
> the branch and then committed it (cvs commit filename). And 
> now, if I look at the directory with my new-found-friend 
> Cervisia (a graphical front end to cvs) it has tags for all 
> the files with my branch name _except_ the file I added and 
> committed, which implies that the new file I added is on the 
> trunk rather than on my branch.  
> 
> So the question I have is -- did I do it >wrong?< 
> 
> And this CVS thang is really cool- I can see using it with 
> "wordpress" (blogware tool at wordpress.org) to make my 
> changes and keep my changes in place with their updates 
> (because I"m running an old version and I'd like to upgrade 
> but ... well... you get the idea).   I was using RCS before, 
> so I'm not a version-systeming virgin, but CVS is a sweet sweet love.
> 
> Your help is, as always, appreciated.
> 
> -Russ
> 
> _______________________________________________
> PLUG mailing list
> PLUG at lists.pdxlinux.org
> http://lists.pdxlinux.org/mailman/listinfo/plug
> 
> 





More information about the PLUG mailing list