[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: Geoff Ballinger <geoff_at_mixipix.com>
Date: 2004-11-16 21:30:18 CET

fbeausoleil@ftml.net wrote:
> 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 :)

        That's basically the approach we are taking here for handling our flash
.fla files. Works after a fashion but we are really looking forward to
v1.2 ;->,


Geoff Ballinger, Chief Technologist                    geoff@mixipix.com
Mixipix Ltd.                                             www.mixipix.com

Received on Tue Nov 16 21:30:57 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.