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

Re: Working on unmergable files

From: Calvin Spealman <calvin_at_ironfroggy.com>
Date: 2004-03-06 03:06:01 CET

On Thursday 04 March 2004 3:12 am, Tim Armes <tarmes@fr.imaje.com> wrote:
> Hi,
>
> Has anyone here found a sensible way of including "unmergable files" such
> as binaries into a SVN repository.
>
> My problem comes from the fact that since there are no file locking
> capabilities in Subversion, there's no way to stop two people from making
> changes to such a file at the same time. It's only upon commit that you
> discover that you can't check in your file. Since merging's not possible
> either, you have to start again...
>
> Any suggestions?
>
> Tim
> ###########################################
>
> This message has been scanned by F-Secure Anti-Virus for Microsoft
> Exchange. For more information, connect to http://www.F-Secure.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org

at the moment, just be careful and communicate. an svn lock command would be
great for this sort of thing tho, and is really needed. that and a way to
tell svn where to find filetype specific diff and patch tools, for when they
could be used.

until then, just communicate.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Mar 6 03:13:31 2004

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