svn_no-merge.bat

Tobias Knauss

unread,

Jan 15, 2021, 1:45:28 AM1/15/21

to TortoiseSVN

Hello Stefan,

I would like to get rid of my no-merge batch file finally (https://tortoisesvn.net/faq.de.html#noautomerge).

Can you please add an option "AutomaticMerge" (default value 'true') in the Advanced Options of TSVN?

Best regards

Tobias

Stefan

unread,

Jan 16, 2021, 2:06:57 AM1/16/21

to TortoiseSVN

and what would that option do?

Tobias Knauss

unread,

Jan 19, 2021, 6:21:50 AM1/19/21

to TortoiseSVN

Stefan schrieb am Samstag, 16. Januar 2021 um 08:06:57 UTC+1:

and what would that option do?

It would force the same behaviour as the batch file does, so that the batch file can be omitted and maybe used for other purposes.

And by removing the batch file, the short flickering of the console windows would disappear as well.

"AutomaticMerge" would be set to "true" by default, resulting in the "normal" behaviour in a merge operation. But if it was set to false, it would block the automatic merge and force a conflict, just as the batch file does.

If you decided to implement that and find, that is an important option, you even might put it into the "dialog options" of TSVN instead of the "advanced options". And if it was even more important, then you might directly add it as an option in the merge dialog, so that you can choose the desired behavior on every merge.

Reply all

Reply to author

Forward