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

Re: User-specific "do-not-merge" for certain file types?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-08-25 11:47:20 CEST

Troels Arvin wrote:
> On Fri, 25 Aug 2006 11:12:34 +0200, Stefan Küng wrote:
>> That won't prevent Subversion from merging the files on an update! The
>> setting you're referring to is only for TortoiseSVN to resolve conflicts
>> or show merges.
>
> The user _never_ uses command-line Subversion. So in that case, it should
> be OK, right?

It has nothing to do with command-line Subversion but with the
Subversion *library*, which TortoiseSVN uses. The settings you want to
change are for the TSVN UI only. The one I told you about are used by
the Subversion library for updates/merges/...

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Aug 25 11:48:11 2006

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