Subversion hook for setting properties

Question

Please, help me with hook script on server which set svn:mime-type to application/octet-stream on all new and existing files automatically on each commit from working copy to repository. (I need it to prevent subversion auto merge files on conflict.)

My platform is Windows.

Answer 1

So,finally we use autoprops(mime-type set to application/octet-stream) on all clients and it looks good. When conflict occurs svn do not auto merge files and we can merge files manually. It is exactly what we want. by the way, what are other impacts of setting this property?

Answer 2

You're using the wrong way to achieve this. Instead, configure a dummy diff tool in your Subversion config file. That dummy diff tool must do nothing but return 1 to indicate that it can't do the merge.

Here's a post explaining more detailed what to do.

But you have to ask yourself if Subversion is the right tool for you or if you should change your workflow. Preventing merging goes against the basic principle of almost any version control system I know of. Hacking something like this into them will never work reliably. So ask yourself why you need this and if it might be better to adjust your work flow.

Answer 3

An alternative solution would be to use autoprops:

http://svnbook.red-bean.com/nightly/en/svn.advanced.props.html#svn.advanced.props.auto