[cvsnt] Question about update conflict

Kerry, Richard richard.kerry at siemens.com
Thu Oct 9 10:22:26 BST 2008


It occurred to me that the OP says he's using .dat for sql files.
If they were held as .sql (or other) there would be no possibility of
confusion with other .dat files that might occur and which (in my
experience) do tend to be non-mergeable binary data.

A totally non-CVSNT answer I realize, and requires the OP to change all
new files, and doesn't affect his existing, committed files .....


> -----Original Message-----
> From: cvsnt-bounces at cvsnt.org 
> [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of Arthur Barrett
> Sent: 09 October 2008 09:52
> To: Duc Hoang; cvsnt at cvsnt.org
> Subject: Re: [cvsnt] Question about update conflict
> Doc Hoang,
> > The question I have here is if there's a way to configure CVS 
> > so that it
> > does not treat the .dat file as text rather than binary files. 
> Yes - there are many ways to do this but you need to do two things:
> 1) change the existing .dat files from -kb to -ko, eg:
> http://www.cvsnt.org/manual/html/update.html#update-options
> http://www.cvsnt.org/manual/html/commit.html#commit-options
> cvs up -ko filename.dat
> cvs ci -f -m "change to a non-binary file" fileaname.dat
> 2) change the 'default' so that new .dat files are -ko
> http://www.cvsnt.org/manual/html/Wrappers.html
> Regards,
> Arthur Barrett
> _______________________________________________
> cvsnt mailing list
> cvsnt at cvsnt.org
> http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt

More information about the cvsnt mailing list