|
From: | Paul Sander |
Subject: | Re: How to treat XML files checked into CVS |
Date: | Tue, 15 Apr 2008 16:39:20 -0700 |
On Apr 15, 2008, at 3:58 PM, Yves Dorfsman wrote:
Larry Jones wrote:Andy writes:Is it good practice to add *.xml -kb to cvswrappers so that XML files are treated as binary to prevent CVS from trying to merge xml documents together?No. XML files are text files and should be treated as such to get correct line endings. If you really don't want merging, then use *.xml -m 'COPY' instead, but merging XML usually works just fine.They are text, but UNICODE, which CVS can't handle properly, so you are better off to deal with them as binary.
Has anyone come up with a viable diff/merge tool for XML?
[Prev in Thread] | Current Thread | [Next in Thread] |