[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Binary files edited by several people

From: Olivier FOURDAN <olivier.fourdan_at_regis-dgac.net>
Date: 2004-03-04 17:21:35 CET

Hi,

IMHO merging is just one way of resolving conflicts. Another way is to
overide changes (which make a lot more sense in the case on binaries)

The fact that you can't merge binary files doesn't mean that Subversion
doesn't handle deltas on binary files internally.

Support of binaries in Subversion is one of its big advantages over many
other SCM tools (I know of no binary merge tool anyway, but that doesn't
mean there are none)

Cheers,
Olivier.

Andre Pietsch wrote:

>Hi!
>
>How does svn handle the issue when two or more people are editing binary files at the same time and are subsequently checking in their files?
>
>I guess the user trying to check in as second will receive a conflict message.
>
>If this is so, how can the website state that svn handles binary files correctly.
>
>The correct handling for binary files would be offering a lock mechanism like cvs edit/unedit or am I getting something wrong here?
>
>Please enlighten me :)
>
>Regards,
>Andre Pietsch
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 4 17:22:36 2004

This is an archived mail posted to the Subversion Users mailing list.