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

text/x-vcard attachment: fbeausoleil.vcf

Received on Tue Nov 16 15:20:20 2004

This message: [ Message body ]
Next message: Dale Worley: "RE: "svn commit" followed by "svn log" doesn't show new revision"
Previous message: Toni Price: "post-commit REPOS var empty"
In reply to: Toralf.Laue_at_bertelsmann.de: "Versioning of non-mergable files ?"
Next in thread: Geoff Ballinger: "Re: Versioning of non-mergable files ?"

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