info-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Conflict upon add


From: Larry Jones
Subject: Re: Conflict upon add
Date: Tue, 25 Jun 2002 11:12:10 -0400 (EDT)

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]