--- "Greg A. Woods" <[EMAIL PROTECTED]> wrote: > C code isn't in a typically linear text format > either, but the way most > people lay it out in a typical linear text file > lends itself very well > to manipulation with diff/diff3/patch -- so well > that research and tons > of practical experience has shown time and time > again that even with > concurrent edits (i.e. merges on almost half of all > edits) there are > very few worrisome conflicts. > > Indeed even English text isn't easily diffable > unless you lay it out in > a way that suits diff/diff3/patch. One such way > that's particularly > effective is the way traditionally suggested for > troff documents. Lines > must end at the end of every sentence. (Obviously > with troff you don't > care if paragraphs are nicely wrapped and filled! > ;-)
You're absolutely right. So, in essence, although it's theoretically not correct to use diff3 on C files, it works in practice, so CVS does it. Similarly, CVS works in practice with non-diff3-able files so people use it. Noel __________________________________________________ Do You Yahoo!? Try FREE Yahoo! Mail - the world's greatest free email! http://mail.yahoo.com/ _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
