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 sales@march-hare.com.
WinCvs 2.0.2.3 (build 3) Client: Concurrent Versions System (CVSNT) 2.5.03 (Scorpio) Build 2151 (client/server) Server: Concurrent Versions System (CVSNT) 2.5.03 (Scorpio) Build 2151 (client/server) I have this scenario: A deployment branch is made at a time, when file1.cs is version 1.6 on the main branch, which is a development branch. Later the version of file1.cs on main branch is version 1.12. At this time the change made from version 1.8 to 1.9 is needed on deployment branch. On deployment branch file I do wincvs update with merge option difference between revision 1.8 and 1.9. This works perfect. Some time later, all changes made on deployment branch is merged to main branch. This is done by making checkout of main branch, and afterwards wincvs update with merge option merge with one tag <Deployment branch name>. This works fine except for files like file1.cs. For file1.cs changes from 1.6 to 1.8 is removed from main branch. That is not what I want. I was very surprised by this. Perhaps this is a feature or correct behaviour. Or perhaps it is an error. Anyway, I really need a workaround to the last merge from deployment branch to main branch. After my last merge, I have more then 300 changes files, so it is not an option to check each file. Changes 1.6 to 1.8 may not be merged to the deployment branch, I only need the difference from 1.8 to 1.9. My current workaround is to make the first merge manually. But this is neither an option, since I can't stop others from doing merges like 1.8 to 1.9. So I need a workaround when the last merge from the deployment branch to the main branch is performed.