On 10/18/05, Dale <address@hidden> wrote:
I'm only barely proficient at CVS. Where I work I was only the second
programmer on this project, and then the first guy left, so now I'm doing
all the CVS stuff on my own.
So then the boss hired another guy who knows even less about CVS do some
work on our project. I'm not sure, but I think he just copied my whole
project over to his account, so now his side is in whatever CVS state it was
in at the time he did that. Now he has made changes that the boss wants
merged into the trunk. When I do a cvs status on his files, they are not
labeled or branched, but their file version numbers are many iterations away
from the repository. What I'm afraid of is that if I start trying to merge
these two, I'll damage the Repository somehow.
So maybe I shouldn't even try to do that? We need to change the name of the
product anyway, and make several other major structural changes, so my
thinking is that I should just strip out all the CVS directories and merge
his stuff with mine by hand, and then start a new cvs project and teach the
other guy how to make branches.
Any thoughts?
Lots.
Unless you the overhaul involves entirely re-creating the
sourcecode directory structure, it is probably worth your
while to branch/update/merge. The hardest part will be resolving
confilcts...
Anyhow, you probably want to:
1. make a backup copy (zip/tar) of the new guy's working copy.
2. make a branch in cvs to merge his stuff into (BR_NEW_GUY_MERGE).
3. update his working copy with the branch (cvs up -r BR_NEW_GUY_MERGE)
4. resolve conflicts
5. check in changes to BR_NEW_GUY_MERGE
6. test: make a build from the branch
7. fix build issues on the branch and repeat from 6
8. When all is well with the branch, merge it back to the main trunk: cvs co myRepo; cd myRepo; cvs up -j BR_NEW_GUY_MERGE
9. test: make a build from the main trunk
10. fix; repeat from 9
11. breath a sigh of relief
12. think up a catchy jingle about you being a cvs god
13. sing it to your self a few times
14. get sick of the new jingle
15. look around to make sure no one saw you singing to yourself or overheard
16. think about becoming a writer of jingles on your drive home
17. get in a fender bender because you were thinking about becoming a
jingle writer and not paying attention to where you were going.
Hope this helps. I know the list looks long but once you get the hang of branching and merging the process will seem easy.
Regards,
--Russ
--
"I'm tryin' ta think, but nuttin' happens!" - Curly Howard
_______________________________________________
Info-cvs mailing list
address@hidden
http://lists.nongnu.org/mailman/listinfo/info-cvs