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.

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

application/x-pkcs7-signature attachment: S/MIME Cryptographic Signature

Received on Tue Nov 16 21:30:57 2004

This message: [ Message body ]
Next message: Peter Yamamoto: "RE: Re: Checkout every file as read-only; make some of them editable with a explicit command."
Previous message: Esteban Bolanos: "RE: Checkout every file as read-only; make some of them editable with a explicit command."
Maybe in reply to: Toralf.Laue_at_bertelsmann.de: "Versioning of non-mergable files ?"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]