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

Re: how to prevent of an automatic merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-05-09 10:34:22 CEST

On 5/9/06, Linton Carver <lintonkwesi@gmx.de> wrote:
> Stefan Küng <tortoisesvn@...> writes:
> >
> > If you tell me how you do an automatic merge during a commit, I'll
> > tell you how to prevent an automatic merge during an update.
> >
>
> Aaaahhhh, I fear I will never get an answer. I only thought, that a commit will
> do the automatic merge, if there is no conflict reason. (I thought that I've
> check this out, but maybe it was in a parallel universe). Ok there is no
> automatic merge during a commit. Do you think it's nevertheless possible to get
> an answer :-)

Possible ways to disable automatic merging during an update:
* tell Subversion that a file is binary and can't be merged: set the
svn:mime-type property of a file to something different than text/*
(e.g. 'application/octet-stream').
* Settings-dialog, first page. Click on "Edit" (Subversion
configuration file). Then, in that file, check the [helpers] section.
There are entries there 'diff-cmd' and 'diff3-cmd'. You can set those
to a script/program which will always return FALSE. That will make
Subversion believe the file can't be merged.

Stefan

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue May 9 10:34:29 2006

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