[cvsnt] Recursive add (as opposed to import)
Gerhard Fiedler
lists at connectionbrazil.com
Mon Aug 14 15:38:20 BST 2006
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
More information about the cvsnt
mailing list