RE: I can not download CVS
Hi Gene, Thank you for your message. I just tried to download file "cvs-1-11-17.zip" and didn't encounter any problem. I didn't perform a login and the URL I used is: https://ccvs.cvshome.org/files/documents/19/231/cvs-1-11-17.zip At this point I'm at a loss to suggest what the issue you're experiencing might be. I'm posting this reply to Info-CVS list in the hope someone else might have some relevant experience. Best regards, Conrad Pino -Original Message-From: Yan Gene [mailto:[EMAIL PROTECTED]Sent: Friday, August 13, 2004 13:07To: [EMAIL PROTECTED]Subject: I can not download CVS I just could not download CVS from cvs home web site. Please take a look. Thank you. Gene SRA International Inc. Phone: (202) 216 - 0768 image001.jpg___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Problem in merge in cvs
Hi, I am facing a wierd problem. There is a branch on main trunk i.e. dev branch. In this branch different developer create their branches and merge their each branh into main trunk after completing their task. Developers are using Tortoise CVS as their tool. When a developer merges his branch after one developer has already merged his branch into dev branch instead of file getting update with the another merge get overridden by the file of last developer who has merged the file. Regards, Ramanuj Singh ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Problem in merge in cvs
Hi Ramanuj I am facing a wierd problem. There is a branch on main trunk i.e. dev branch. In this branch different developer create their branches and merge their each branh into main trunk after completing their task. I don't think this idea would work as it is. Developers are using Tortoise CVS as their tool. When a developer merges his branch after one developer has already merged his branch into dev branch instead of file getting update with the another merge get overridden by the file of last developer who has merged the file. The problem would always occur. The reasoning is that both developers create branch from one version and then first devel. commits its changes to trunk. But second devel would not have these changes in his copy. So when he tries to merge the file into trunk, CVS would think that in the new version those changes are removed and would remove them in new version. This problem can also occur when one commits his changes without updating his local copy. One solution would be that each developer keeps merging regularly (or whenever other devel. merges his changes to trunk) the TRUNK into his branch so that his branch is updated and in sync with the Trunk. HTH Rohan ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
cvs newbie seeks advice on best way to set up
we have a small php/mysql project and only two developers, but we would like to manage the project using cvs. we want to be able to access the repository managed by cvs through apache and we want to set up two subdomains on our local testing server to point to our working copies. can apache be pointed to the folder containing the master cvs repository? if not, what is the best way to keep an up to date version of the project in the web server's document root? where is the best folder to put the cvs repository? thanks in advance, blake ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
