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

RE: Side effects of disabling automatic merges using the mime-type?

From: Brent Webster <brent.webster_at_liquidcomputing.com>
Date: 2006-01-25 15:32:59 CET

I agree with Gunter. I tried using mine-type, set to
application/octet-stream, for various ascii based Rhapsody sources
files. Rhapsody requires its own diffmerge.exe to be used but I still
want all the information provide by the status, blame, etc commands
which will flag me that I should run their diffmerge.exe tool. I just
don't want these files to be automerged. I've got the team using
        svn diff --diff-cmd diffmerge.exec <xxxx.sbs>
to determine difference and merge them as a separate step.


>>-----Original Message-----
>>From: Gunther Popp [mailto:svnuserlist@guntherpopp.de]
>>Sent: January 25, 2006 6:51 AM
>>To: users@subversion.tigris.org
>>Subject: Side effects of disabling automatic merges using the
>>I've read several threads addressing the issue of disabling
>>automatic merges using the svn:mime-type property. In
>>enterprise environments automatic merges are a big concern
>>and sometimes simply not acceptable.
>>A separate option for turning off this feature would be
>>great, but right now the mime-type property seems to work OK.
>>Up to now I figured out the following side-effects of using
>>binary mime-types for text-files:
>>* svn:eol-style doesn't work (same is probably true for
>>keyword expansion, but I didn't try this out myself)
>>* diff doesn't work, unless you specify the --force option
>>* blame doesn't work (no --force option available)
>>* merge doesn't work, unless you specify the --force option
>>Is someone aware of any other disadvantages or pit-falls?
>>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>>For additional commands, e-mail: users-help@subversion.tigris.org

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 25 15:37:28 2006

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.