[cvsnt] Re: commiting multiple changes to a binary type file from multiple users

[Bo Berglund]

On Tue, 12 Oct 2004 21:44:43 -0400, "Albrecht John"
<albrecht_john at bah.com> wrote:

>What happens to a binary file checked out by multiple users after the first
>person is able to commit their change? When the 2nd person tries to commit
>their change they are forced to update correct? When they update is their
>local changes lost?    
>
> 
Their locally modified file is renamed with the revision number it is
based on and remains in the sandbox. This is also displayed by cvs in
the text output. Thus it is not "lost" but rather put aside. It would
be possible for manual merging between the file from the repository
and the renamed file if both are opened in the binary editor
(Microsoft Word?) and compared manually.
But there exists no safe way to *automatically* merge binary files and
expect a usable result...


/Bo
(Bo Berglund, developer in Sweden)