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

Re: Enforce always conflict during the update procedure?

From: Joshua Varner <jlvarner_at_gmail.com>
Date: 2005-07-07 16:12:42 CEST

On 7/7/05, Libor Jendele <Libor.Jendele@atlas.cz> wrote:
<snip>
>
> During the suggested update, sometimes I'll get a conflict that has to be
> resolved manually. This behaviour I like, too. However, the problem is that
> somtimes (e.g. in case of only additions of some new lines to the file etc.)
> the system "updates" my local version of the file automatically and I have
> no way to compare the result of such an update with my (local, PC) version
> of the updated file prior the automatic update! The local version od\f the
> file gets overwritten without leaving any backup copy to which I can compare
> !! This way a lot of problems can be inserted in my sorce data files.
>
> Therefore I wonder, if you can suggest me. how can I suppress the quotted
> automatic merge during the update and enforce to obtain a conflict situation
> in all cases, i.e. even case of minor and negligable changes in the document
> during the update that are now handled automatically.
>
I'm not sure if this is possible, but see next comment for a way to
see the differences without doing the update.
<snip>
>
> Can I do it somehow from outside or a modification of the source code is
> needed? I tried to use external KDiff3 program with an option supressing any
> automatic merge. Unfortunatelly, it didn't help.
>
'svn diff -rHEAD' will give you the differences from the current
version on the server, I'm not sure how to do that in TortoiseSVN
though.

Josh

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 7 16:15:15 2005

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