Re: Problem to avoid automatic merges during updates
Schreiner Matthias wrote:
> Hi all,
> We have here some problems with the automatic merge during updates. For
> unshared files, we used the property: svn:need_lock.
> But for the other files we would like to disable the merge, and do it by
> I found 2 ways in the web, how to do this (none of them are working).
> 1) "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
diff-cmd is not used for merges, diff3-cmd is.
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-10-29 08:37:16 CET
This is an archived mail posted to the TortoiseSVN Users