Re: Auto-merge control...

Robert Conde wrote:
> This might be a subversion issue...but it would be great if there were
> better control over automerging files. We much prefer to manually merge
> the files. Our solution thus far has been to put a non-text mime type on
> all our source files to prevent automerging. Unfortunately this has
> undesirable side effects such as dis-abling the blame functionality. It
> would be great if you could just disable auto-merging on a per file
> extension basis.

To disable auto merging completely, edit the config file (settings
dialog, general page, click on "Edit").
In the [helpers] section of the config file, you can specify which
diff-cmd and diff3-cmd Subversion should use. If you specify there e.g.
a batch file which always returns FALSE, Subversion then always creates
a conflict and doesn't merge the changes automatically.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org