How to turn off “auto-merge” in Subversion
One of the features that Subversion provides for text based files is automatic, line-based merging of changes from the server during an update.
But there may be files for which you don’t want to have any changes merged into automatically. (I don’t know why exactly but I’m just the search monkey 
A simple trick to do this is to change the Subversion mime-type property of a file into something non-text based. Then Subversion will not try to do an auto-merge (or at least TortoiseSVN won’t)
A good choice for the new mime-type would be
application/octet-stream
Which just means a general binary type file, but here are some more choices if you want to be more descriptive.
To set the Subversion tag of a file using TortoiseSVN:
1. Right-click on the file and select properties,
2. Select the Subversion tab and enter the tag.
This picture illustrates the last part:
To change the property using the command line svn client:
svn ps svn:mime-type application/octet-stream /path/to/file
The Subversion book offers some more insight on mime-type tags too.
-
|
|
|
|
