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

autoprops mime-type=application/octet-stream being merged

From: Toal, Michael (GE Intelligent Platforms) <michael.toal_at_ge.com>
Date: Wed, 4 Aug 2010 09:34:14 +0100

svn server 1.6.12

tsvn 1.6.9 build 19725/32bit


We have an autoprops setting that sets mime type to binary.

We have noticed that on occasion tortoise / svn is merging these files
rather than conflicting.


enable-auto-props = yes
*.mdl = svn:mime-type=application/octet-stream


Is this a known bug, or am I doing something wrong?



Michael Toal

Software Engineer

GE Fanuc Intelligent Platforms

Applied Image Processing


T +44 1344 381237

M +

F +44 1344 381282

Email: michael.toal_at_gefanuc.com <mailto:michael.toal_at_gefanuc.com>



Edenfield, Larges Lane

Bracknell, Berkshire RG12 9AT, UK

GE Fanuc Intelligent Platforms (Bracknell) Ltd, registered in England
and Wales (2393111) at 100 Barbirollis Square, Manchester, M2 3AB. VAT
GB 927559189


GE imagination at work


GE Fanuc Intelligent Platforms Confidential and Proprietary. If you
have received this message in error please notify us immediately and
permanently remove it from your system and destroy any printed


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-04 12:35:42 CEST

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

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