WinCVS - looking for some help please

#1 I don't know that this will solve your problem right off (I'm not a CVS guru, unfortunately):, but it's still damn useful:

cvsbook.red-bean.com/

(My favorite CVS tool for Windows is TortoiseCVS, though I doubt it would make this task any easier)

edit: fixed typo, noted Tortoise's existence.

#2 Thanks for the link.

Can't really find anything in there about my situation though. I think I have it all figured out except the CVSROOT variable. All I need to know is how to set up the CVSROOT when the modules are all on the same machine. I just can't find that anywhere :(

#3 Rodney,

Have a look at this thread.

Rich

#4 I saw that thread - that's where I got the idea to set it up the way I am. I just can't make it work :)

I have a local folder named \torque_head that I downloaded the head version to. I keep this updated with the CVS server and don't touch the code, so it's always a mirror of the CVS server. Now, I want to import that into another folder named \torque_local_head, which I can use to import my own projects from (in case I want to do more than one project to test ideas, etc.).

I originally did a file copy to make the new folder, but diffing/merging that by hand is a pain the further I get from the head code, so I was looking to set up WinCVS to do it for me. That's when I saw that thread, but I just can't get the CVSRoot set up to work properly.

#5 Rodney,

If I understand your setup correctly (i.e. you do not run your own CVS server), you can not use WinCVS to merge between two directories on you PC. I think you can accomplish what you are attempting by following the below steps:

1) You already have a clean copy of the HEAD checked-out in the directory \torque_head. Continue using this directory to only update from GG's CVS server as you are doing.

2) Check-out (do not copy from \torque_head) another clean copy of the HEAD to another directory (say \torque_head_mod).

3) Merge your code changes into the \torque_head_mod directory. This will need to be done by hand or one of the many third party tools mentioned in the thread above. This should only need to be done once as I assume you will be using this directory as your development area.

4) When you decide it is time to merge in new HEAD changes from GG's, do an update in WinCVS to the \torque_head_mod directory.

You can now repeat step #4 anytime you desire to get the latest fixes from GG's. The downside to this it when conflicts are found and how CVS tags them (but that is another discussion).

Rich

#6 Rich,

Thanks for the help. That sounds like it might work. I hated to check out 2 complete copies of head from the CVS server though (bandwidth usage, etc.). Maybe if I wait a few days between downloads I can get away with it :)