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

Re: Bug? using WinMerge 2.8 for merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 30 May 2008 17:59:54 +0200

Corn wrote:
> Hi,
>
> now that WinMerge 2.8 is actually able to merge :-) I tried to
> integrate it with TSVN (the most recent one). I simply tried entering
>
> "C:\Program Files\WinMerge\WinMergeU.exe" %merged
>
> into External Programs/Merge Tool, but this launched WinMerge with the
> following cmdline:
>
> "C:\Program Files\WinMerge\WinMergeU.exe" "E:\src\test.hpp" "E:\src
> \test.hpp.merge-left.r1408" "E:\src\test.hpp.merge-right.r1411" "E:\src
> \test.hpp.working" "E:\src\test.hpp"
>
> so it looks more like if I'd say
>
> "C:\Program Files\WinMerge\WinMergeU.exe" %merged %base %theirs %mine
> %merged
>
> In other words, it seems to be unconditionally appending "%base
> %theirs %mine %merged" to the cmdline.
>
> Am I doing something wrong, or is this a bug?

Thanks for the report:
It's a bug which I fixed in r13060.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-05-30 18:00:07 CEST

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