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

Re: [TSVN] FW: TortoiseSVN: can a turn of atomatic merging when resolving co nflicts?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-10-07 13:09:51 CEST

On 10/7/05, Lübbe Onken <l.onken@rac.de> wrote:

> In our project we use TortoiseSVN and we have some problems when resolving
> conflicts.
> It seems the tool does automatic merges, or at least touches our code
> unwantedly,

First of all, it's not TSVN that touches your files but the Subversion
library. (just FYI).

Yes, Subversion does automatic merges. But it *only* inserts so called
conflict markers in your files if it actually *can't* merge changes
automatically (i.e. if someone else modified the same lines in the
code as you did in your working copy). So be happy that it does so!
Because that way you see immediately that somethings wrong and that
you have to decide which changes you like to keep: your changes or the
changes the other person did. Subversion can't make that decisioin for

> by inserting "merge" lines. Leaving the developer to check where something
> was merged.

In that case, you get a "conflict". And conflicts must be resolved by humans.

> Can I in some way (option, configuration setting) prohibit this kind of
> behavior?

It's not clear what you really want. Do you want Subversion to decide
for you which changes to keep and maybe break your code? Or do you
want Subversion to stop every try on merging changes at all?
If the latter, you can open the Subversion config file (from the TSVN
settings dialog) with your text editor, then find the line

diff-cmd =
diff3-cmd =

remove the comment chars ('#'), and then add the name of a batch file
after the '=' sign. That batch file should contain one line:

exit /B 1

This will make the diff program always return false, which then will
have Subversion *not* merge changes but always leave the file marked
as conflicted.

A simpler (but more work to do) approach would be to set the
svn:mime-type property of *all* your files to something non-text like
(e.g. application/octet-stream). Since Subversion can't merge binary
files, you'll get the same effect.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Oct 7 13:10:21 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.