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.
Hello Tony, >> It looks like the Bug 'conflicts duering merge shown as "modified"' is >> back again with the latest build (today in the morning)... >> the CVS/Entries file only has 'Result of merge' for the conflicting >> files. >> TH> Hmm.. works fine here... Are you doing something special/different to TH> trigger the bug? I updated the cvsnt tree. And I have a slightly different build environment (path to Kerberos, already added missing .lib references etc.). Thus I got conflicts in the involved .dsp files. These conflicts did only appear in the log. But the line in CVS/Entries is "Result of merge"... ---> cvs server: Updating cvsntcpl RCS file: /usr/local/cvs/cvsnt/cvsntcpl/cvsntcpl.dsp,v retrieving revision 22.214.171.124 retrieving revision 126.96.36.199 Merging differences between 188.8.131.52 and 184.108.40.206 into cvsntcpl.dsp rcsmerge: warning: conflicts during merge cvs server: conflicts found in cvsntcpl/cvsntcpl.dsp C cvsntcpl/cvsntcpl.dsp --- /cvsntcpl.dsp/220.127.116.11/Result of merge//TCVSNT_1_11_1_3_REL <--- Client: Concurrent Versions System (CVSNT) 18.104.22.168 (Daily Snapshot Build 57j) (client/server) Server: Concurrent Versions System (CVSNT) 22.214.171.124 (Build 57h) (client/server) -- Best regards, Richard mailto:r.wirth at wirthware.de