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.
While merging changes from a vendor branch into the main trunk, several files were marked 'conflict' in the log output, but afterwards in CVS/Entries thiese files are only marked 'modified'! So WinCVS does not show the 'conflict' icon. What's going wrong??? output from cvs -z3 update -d -jV2_30_b22 .... RCS file: l:/CVSBASE/aProject/SDK/Windows/Error.h,v retrieving revision 1.1 retrieving revision 18.104.22.168 Merging differences between 1.1 and 22.214.171.124 into Error.h rcsmerge: warning: conflicts during merge C SDK/Windows/Error.h cvs server: Updating SDK/Windows/Control .... contents of CVS/Entries: ... /Window.h/126.96.36.199/Sat Aug 24 21:57:36 2002// D/Control//// /Error.h/1.2/Result of merge// .... cvs version is 'last night build' (client and server on WIN2k) -- Best regards, Richard mailto:r.wirth at wirthware.de