Aditya Sanghi <[EMAIL PROTECTED]> on 03/08/2000 07:23:32 AM
To: [EMAIL PROTECTED]
cc: (bcc: Rex Jolliff/YM/RWDOE)
Subject: Binary files and subsequent updates
> CVS does not attempt to merge changes into a file defined as binary.
> Right?
> So...
> Tom <- checksout - binaryBlob 1.1
> Dick <- checksout - binaryBlob 1.1
> Tom changess binaryBlob 1.1 in his own area.
> Dick changes binaryBlob 1.1 in his own area.
> Tom commits binaryBlob 1.1 => repository has binaryBlob 1.2
> Dick commits binaryBlob 1.1 => NO
> <= repository asks Dick to update his binaryBlob 1.1
> with 1.2
> Dick <- updates - binaryBlob 1.2
> QUESTION .... has Dick lost all his changes?
No. The server writes out two files into Dick's directory: .binaryBlob.1.1
and .binaryBlob.1.2. The server then indicates that a conflict has occured
and that Dick must resolve it.
> What has happened to Dick's binaryBlob 1.1??
Dick's changes are still contained in binaryBlob.
> How did CVS update the binaryBlob file in Dick's area?
See above.
> What is the solution for this?
Dick must examine the three files he now has in front of him and construct
a new file which contains all relivant changes.
> How do developers working on forms (e.g. Visual Basic forms ,
> Delphi forms ) handle this situation??
With some difficulty im sure. It is unfortunate that vendors chose to
write the form definition files in a nonmergable format, but it would
seem that they do. Since the files are in a proprietary format, the
only tool that can resolve conflicts is the ide itself. Perhaps someone
will step up and write a diff3 type tool for VB or Delphi forms?
Rex.
