Re: TortoiseMerge.exe - %1 is not a valid win32 application

Nagypál Gábor wrote:
> Dear all,
>
> first, just to let you know that I am new to SVN.
>
> I have a conficted file. I opened it with the Edit Conflicts button,
> and later then when i click on the "mark a resolved" button, i get the
> "%1 is not a valid win32 application" message.

After checking the code, I can't see how this can happen. Here's what we
do in the event you click on the "mark as resolved" button:
* get the full path to the current module (i.e., your instance of
TortoiseMerge that's running). That's usually "C:\program
files\TortoiseSVN\bin\TortoiseMerge.exe"
* cut of the filename, which gives C:\program files\TortoiseSVN\bin\
* append "TortoiseProc.exe /command:...."
* create a process with the command line created out of the path and the
commands appended before.

There's no place we deal with %1 or some registry entry which might have
an '%1' in it.

Please try uninstalling TSVN and installing it again.

Stefan

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