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

Re: Bug with External Diff on Vista

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-05-26 11:19:34 CEST

Spintz wrote:
> I'm using -
> TortoiseSVN 1.4.3, Build 8645 - 32 Bit , 2007/02/04 09:40:57
>
> I'm running on Windows Vista Home Premium 32bit.
>
> I installed the Perforce Diff and Merge tools and setup the command to
> execture the diff as -
> "C:\Program Files\Perforce\p4diff.exe" "%base" "‌%mine"
>
> The file I'm diff-ing is called main.cpp in the directory -
> "C:\IrrSpintz\trunk\original examples\IrrTerrainRendering"
>
> When I right click and and select Diff, the dialog comes up for the
> Perforce Diff tool and File 2 is displayed as -
> ?C:\IrrSpintz\trunk\original
>
> Don't know where the question mark comes from and it's getting screwed
> up on the space between 'original' and 'examples' in the path. I have
> %base and %mine in quotes, same as I did on Windows XP where everything
> worked.

Please try the following to narrow the problem down:
* open the registry editor, go to HKCU\Software\TortoiseMerge, create a
DWORD entry named "Debug" and set the value to 1 (you can remove that
key after testing)
* change your custom diff tool from p4diff to TortoiseMerge (do *not*
set it to just use "default" but specify TortoiseMerge as your external
merge tool)
* do the diff: a dialog will pop up showing the exact command line
params TortoiseMerge was started with.
* check the command line params in that dialog:
   - do they have double quotes?
   - are the paths properly enquoted?
   - are the paths passed correctly?

Then, click on OK to dismiss the debug dialog showing the params. If
TortoiseMerge is started correctly, then it's a problem with p4diff. If
not, then I need to know the exact params TortoiseMerge was started with
(hit Ctrl-C when the debug dialog shows up to copy the message to the
clipboard).

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat May 26 11:19:48 2007

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