Aditya Sanghi writes:
>
> CVS does not attempt to merge changes into a file defined as binary.
> Right?
[...]
> Dick <- updates - binaryBlob 1.2
> QUESTION .... has Dick lost all his changes? What has happened to
> Dick's binaryBlob 1.1?? How did CVS update the binaryBlob file in
> Dick's area?
What happens is:
cvs update: nonmergeable file needs merge
cvs update: revision 1.2 from repository is now in BinaryBlob
cvs update: file from working directory is now in .#BinaryBlob.1.1
That is, cvs renames Dick's version, gets the current version from the
repository, and tells Dick he needs to decided what (if anything) he
wants to do to merge the changes.
-Larry Jones
Fortunately, that was our plan from the start. -- Calvin
