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

Integrating with winmerge

From: Corn <filip.konvicka_at_gmail.com>
Date: Fri, 30 May 2008 08:22:00 -0700 (PDT)

Hi,

now that WinMerge 2.8 supports merging :-) I tried to integrate it
with TSVN. I tried just simply

C:\Program Files\WinMerge\WinMergeU.exe %merged

in "External Programs/Merge Tool" (WinMerge expects just the conflict
file on its cmdline), but that launched winmerge with

"C:\Program Files\WinMerge\WinMergeU.exe" "E:\test\file.hpp" "E:\test
\file.hpp.merge-left.r1408" "E:\test\file.hpp.merge-right.r1411" "E:
\test\file.hpp.working" "E:\test\file.hpp"

so more like if I'd set

C:\Program Files\WinMerge\WinMergeU.exe %merged %base %theirs %mine
%merged

(like it added "%base %theirs %mine %merged" unconditionally to the
command line).

Am I doing something wrong, or is this a bug?

Thanks,
Corn

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-05-30 17:35:03 CEST

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