Re: get error when I revert to revision x (

On 09/10/2007, Hansi Hansi <hansiPet@web.de> wrote:
> >>Show log for a file or for a folder?
> it is a folder
>
> >> As diff tool I use WinMerge and as merge tool I use TortoiseMerge
>
> >Merging is done internally by Subversion, unless you have assigned a
> >different tool in the Subversion config file. That might cause an
> >error ...
>
> This is possible.Because the settings for diff3-cmd are using a script with a winmerge program.
> Until now I thougt that TortoiseSVN uses the internal TortoiseMerge (in the settings this is selected). Isn't it?

You are confusing the automatic merging which Subversion does whenever
there are both local and repository changes to a file, and conflict
resolution, which is what you need to do with a visual tool like
TortoiseMerge.

The svn config file deals with the former. You only need to change
that if you don't like svn's automatic merging. If you want to change
the visual diff/merge tools you need to go to TortoiseSVN settings
dialog.

Simon

-- 
       ___
  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