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? -- "I'm tryin' ta think, but nuttin' happens!" - Curly Howard _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
