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

Re: Versioning of non-mergable files ?

From: François Beausoleil <fbeausoleil_at_ftml.net>
Date: 2004-11-16 15:14:50 CET

Toralf.Laue@bertelsmann.de wrote:
> Any advice would be helpful.

Locking is being implemented at this moment in Subversion. This should
help with this kind of problem.

In the meantime, set svn:mime-type on the file, with a non-textual
mime-type. application/octet-stream works great for that. This will
prevent svn from attempting to automatically merge the files on update.

And tell your developers to E-Mail each other until 1.2 is out :)

Bye !
François

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Received on Tue Nov 16 15:20:20 2004

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