Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to email@example.com.
Hi, I'm not sure if there is a proper "procedure" for this. Insights would be appreciated. I have renamed some files in a branch using cvs rename and committed them properly (commit the directory) as per the documentation. Everythign works great as long as I remain within the branch. However, when I try to merge the branch back into the trunk, the renamed files aren't merging. I had been expecting the renamed files to replace the trunk files, but that doesn't seem to be the case. Is there a proper procedure to accomplish this? Or is my only solution to either a) rename files in repository, or b) delete/add the newly named files? Thanks, Eric