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

Re: Question about TSVN

From: Ron Wilson <ronw.mrmx_at_gmail.com>
Date: Thu, 13 Mar 2008 11:15:05 -0400

On 3/13/08, Milen A. Radev <milen_at_radev.net> wrote:
> On 13/03/2008, Jeremy Morton <jeremy.morton_at_spira.co.uk> wrote:
> [...]
> > Is there a way I can set certain files with TortoiseSVN to be 'monitored', so that if they've been changed when I do an update, TortoiseSVN will hold off on merging them until I've approved the changes?
> May be this recipe would help you, but it's not selective - it would
> prevent any auto-merges: http://tortoisesvn.net/node/241.

Alternately, instead of a script/program that always returns an error,
could put the qualification logic in the script, then either run the
real diff (or diff3), or return error.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-03-13 16:15:15 CET

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