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.
Nick Duane wrote: >> Avoid $Log$ if you're doing merging - it doesn't merge well at all, since >> all the log comments create differences. > Hmmm. I find the $Log:$ comments very useful and would hate to loose that > feature. I don't understand what you mean by them creating differences. See here for some info http://www.cvsnt.org/manual/html/Log-keyword.html Even if everything else in the file merges fine, the pack of log lines may create an unnecessary conflict that has to be fixed manually. Which then links back to the issue with the log entries in the file being "fixed" manually, without updating their original data in the cvsnt commit comments. Gerhard