Disable automativ merge

[kicmemm...@gmail.com]

Hello,

we use TortoiseSVN 1.11.1 (updated to this version after a long time) and it seems that the hack to disable automerge doesn't work anymore (see here https://www.codeproject.com/Tips/157286/Prevent-Subversion-from-doing-automatic-merges or in the FAQ).

diff-cmd and diff3-cmd is set to the batchfile which contains the two lines of code but it seems that this has no effect anymore.

Any idea how to prevent automerge and show files as conflict due updating?

Greetings

Stefan

[ChrisNMattthias LoyNWeber]

Hi,

is there a solution available? I am facing the same problem.

Greetings

Matthias

[Daniel Sahlberg]

It works fine in TortoiseSVN 1.14.5, however the diff-cmd and diff3-cmd must be separate lines, like this:

diff-cmd = "C:\\false.bat"

diff3-cmd = "C:\\false.bat"

I've added some formatting to the English FAQ (it was already there in the German FAQ, see https://tortoisesvn.net/faq.de.html#noautomerge), it will be published whenever the web site is updated.

Kind regards,

Daniel Sahlberg

[ChrisNMattthias LoyNWeber]

I tried it with 1.14.5 and it works.

Is there a way to exclude merge just for a group of file types (e.g not *.py, *.c)?

Best

Matthias

[Daniel Sahlberg]

måndag 17 juli 2023 kl. 15:48:29 UTC+2 skrev chris...@gmail.com:

I tried it with 1.14.5 and it works.

Is there a way to exclude merge just for a group of file types (e.g not *.py, *.c)?

If I'm reading the SVN book correctly, you get the filenames in the 6th and 7th parameters. Please see https://svnbook.red-bean.com/en/1.7/svn.advanced.externaldifftools.html for further details.

You should then be able to extract the extension using %~x6 and/or %~x7.

Kind regards,

Daniel

[Daniel Sahlberg]

tisdag 18 juli 2023 kl. 22:51:05 UTC+2 skrev Daniel Sahlberg:

måndag 17 juli 2023 kl. 15:48:29 UTC+2 skrev chris...@gmail.com:

I tried it with 1.14.5 and it works.

Is there a way to exclude merge just for a group of file types (e.g not *.py, *.c)?

If I'm reading the SVN book correctly, you get the filenames in the 6th and 7th parameters. Please see https://svnbook.red-bean.com/en/1.7/svn.advanced.externaldifftools.html for further details.

You should then be able to extract the extension using %~x6 and/or %~x7.

... and selectively return 1 or 0 depending on the extension.