[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Problem to avoid automatic merges during updates

From: Schreiner Matthias <Matthias.Schreiner_at_alcatel-lucent.de>
Date: Wed, 29 Oct 2008 07:47:47 +0100

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 hand.
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
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."

2) change the property of the files to an binary file (I found the property "executable", and tried this).

But the behaviour is the same,... no error, no warning, files are merged as before !!!!!!!

We are using TSVN 1.5.5 on SVN 1.5.4

Can anyone help us ?

Thanks a lot

Matthias

_____________________________________________

Matthias Schreiner Alcatel-Lucent Deutschland AG
Mobile Networks Division MS/E
BTS Competence Center Lorenzstrasse 10
Tel: +49 711/821 3 21 38 D-70435 Stuttgart
Fax: +49 711/821 3 02 35 Germany
E-Mail: matthias.schreiner_at_alcatel-lucent.de

Office Address: Building 55, Floor 2, Room 25
_____________________________________________

Alcatel-Lucent Deutschland AG
Sitz der Gesellschaft: Stuttgart - Amtsgericht Stuttgart HRB 4026
Vorsitzender des Aufsichtsrats: Michael Oppenhoff
Vorstand: Wolfgang Weik (Vors.), Dr. Rainer Fechner, Jürgen Pösinger, Alf Henryk Wulf
Received on 2008-10-29 07:48:06 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.