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

get error when I revert to revision x (

From: Hansi Hansi <hansiPet_at_web.de>
Date: 2007-10-09 20:08:26 CEST

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

Best regards
Hansjörg
_____________________________________________________________________
Der WEB.DE SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen!
http://smartsurfer.web.de/?mc=100071&distributionid=000000000066

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Oct 9 20:11:56 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.