Re: Conflict upon add

[Mike Ayers]

	I had it as a binary.  I still have no idea what caused the conflict, but when 
I committed it, there was no problem.


/|/|ike

Larry Jones wrote:
> Mike Ayers writes:
>
> > 	Using WinCVS, I added a PDF file to my archive (PDFs illustrate the problem of 
> > text file canonicalization - I don't know whether they're text or binary, but 
> > must check them in as one or the other).  Once added, it displayed as a 
> > conflict file.  It is my understanding that one needs revisions of a file for 
> > that file to be in conflict, yes?  Any idea what is happening here?
>
>
> I'm guessing you added the file as text -- PDF files are binary.  The
> resulting corruption of the repository file and/or the file in your
> working directory probably confused WinCVS.
>
> -Larry Jones
>
> Oh yeah?  You just wait! -- Calvin
>
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs