Re: Deactivate automatic merge

Kathrin Bauer wrote:
> i want to deactivate the automatic merge in Tortoise as well as in
> Subclipse for the complete repository. After updating, the SVN client
> should generate different files containing the different matters (my
> working copy, the repository version, the version of another user and
> the merged version)
>
> How can I do this?

I think I got this right ...

Create a batch file (eg. C:\FALSE.BAT) which contains the single line
@exit 1

TortoiseSVN->Settings->Edit subversion config file.
Uncomment the [helpers] section
Add a diff-cmd setting:
diff-cmd = c:\false.bat

That will cause all automatic merges to fail and force your working copy
into the conflicted state, and will generate the different files you
want. Because this is a subversion config, it should affect all SVN
clients including TSVN and Subclipse. It is global to your PC, not
per-repository.

Simon

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