[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: How to treat XML files checked into CVS
From: |
Larry Jones |
Subject: |
Re: How to treat XML files checked into CVS |
Date: |
Tue, 15 Apr 2008 12:07:29 -0400 (EDT) |
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.
> I also could see nobody realizing a merge conflict occured in an XML
> document.
That isn't likely since CVS tells you there's a conflict when you update
and won't let you commit the file until you've fixed it.
-Larry Jones
Kicking dust is the only part of this game we really like. -- Calvin
- How to treat XML files checked into CVS, Andy, 2008/04/15
- Re: How to treat XML files checked into CVS,
Larry Jones <=
- RE: How to treat XML files checked into CVS, Arthur Barrett, 2008/04/15
- RE: How to treat XML files checked into CVS, Arthur Barrett, 2008/04/15
- RE: How to treat XML files checked into CVS, Arthur Barrett, 2008/04/15
- RE: How to treat XML files checked into CVS, Arthur Barrett, 2008/04/15
- RE: How to treat XML files checked into CVS, Bulgrien, Kevin, 2008/04/16