Rene Rivera wrote:

Reece Dunn wrote:

...

I'm afraid I don't know how to fix this one as I don't understand how CVS branches work. I understand the concept of branches and merging from a Perforce PoV, but not how that relates to CVS.

Hm, how to best explain this... Classically, as in revision control lingo, CVS uses inplace branches. Think of them as having all those Perforce branches overlaid onto the same file tree. And what you use to differentiate them, instead of the repository paths in Perforce, is a virtual keyed path on the version number.

Thank you for the detailed explanation.

...

I am currently using TortoiseCVS. Do you know if WinCVS is easier to use for branching?

TCVS is marginally more convenient to use. WinCVS, if you have the Python and TCL extensions enabled, has some nifty commands available. As for branching the are both about the same. That is they are both equally restricted by the terrible branching model of CVS :-) OK the fixing it part with TCVS as that's what I use most of the time (I also use WinCVS and the CLI).

Thanks again for helping me understand this.

PS. Make use of the revision graph display. It helps to understand what it's really doing under the hood. And of course as Dave mentioned, learn the CLI tools also.

I always try to understand the CLI tools, but I need to understand the concepts first. Your reply has helped me to understand the way that branches work in CVS and has given me a starting point to help with the CVS documentation. Thanks, - Reece _________________________________________________________________ Try Live.com: where your online world comes together - with news, sports, weather, and much more. http://www.live.com/getstarted