How to use TortoiseMerge.exe as external diff/merge & conflict resolving tool ?

( SVNSCC , VS .NET, 1.2.1_050822, 64bit )

Type: Public Status:Closed Created: 07 Oct 05 10:00 Updated: 17 Oct 05 10:00

--> Igor Pushkov (admin) at 17 Oct 05 10:00 writes

In fact we found that it is possible submit two files with command line
switches /base: and /yours:. However anyway plug-in not does not have
configuration for conflict resolving tool, just assuming that it pass 2
parameter (files) to it.
But anyway intermidiate bat file should work. It will look like
call {path to tortoisemerge} /base:%1 /yours:%2

--> Igor Pushkov (admin) at 17 Oct 05 10:00 writes

We allow customizing of calling parametrs only for compare\view tool, which
is called from history dialog or on "Show diffrences" command. In both
cases it is possible to choose either 3-way comparison either 2-way.
Unfortuantly TortoiseMerge (at least as we discover) always requires 3 file
in command line, while on conflict available only two files. if used as
compare/merge tool you need configure 2-way cmd as %1 %2 %2. I.e. submit
each file two times.
To use TortoiseMerge as conflict resolver tool we either need modify
plugi-in (which cannot be very fast) either you make an intermidiate batch
(.bat) file which correctly call TortoiseMerge. Of course in that case you
need configure plug-in to lauch this . bat file as the conflict resolver
tool. This is tricky but should work.

--> Ludens Games, Inc. (user) at 07 Oct 05 10:00 writes

Hello, PushOk team,

We're licensed user of SVN proxy ( and we also purchased copies of CVS
proxy, too.)

We have the same problem described in URL:
http://www.pushok.com//tickets_addmodify.php?id=755

That is,
if we configure SVN proxy to use external tools for conflicts resolving,
and try to check in a source with conflicts, no external tool gets
launched. I guess SVN proxy can detect conflicts because it launches
"CvsConflictEditor.exe" when I set the option to use "Built-in" tools.

We have compared "built-in" CvsConflictEditor.exe ( I also found same thing
in
http://sourceforge.net/pm/?group_id=29689
while I tried to figure out the correct command line option for
TortoiseMerge.exe )
with TortoiseMerge.exe and we like TortoiseMerge tool more.

So, here's our questions:

Can I use TortoiseMerge as my external conflict resolving tool ?
If so, what is the correct configuration for "3-way cmd" option?
If not, what tools are out there that are as good enough as TortoiseMerge
and have no problem with SVN proxy ?

Rate this ticket:

Not useful at all

Partially useful

Useful

Very useful

Ticket

How to use TortoiseMerge.exe as external diff/merge & conflict resolving tool ?