Re: [PATCH] Make TortoiseMerge accept two file names

Tobias Schäfer wrote:
> Hi Stefan,
>
> I would like to commit the attached patch but before that I'd like you to
> review the change.
>
> I would like to be able to call TortoiseMerge with two file names as
> parameters to be able to use TortoiseMerge as a Diff-Tool for another
> application: "TortoiseMerge.exe file1.txt file2.txt"
> This is the same syntax which CAppUtils::StartExtDiff uses if %base
> and %mine are not set.
>
> Currently TortoiseMerge expects the file names to be prefixed with /base:
> and /mine:.
>
> Do you have any concerns about this change? Should we also support three
> parameters to optionaly set %theirs?

Patch looks good. But why don't you use the CCmdLineParser class to get
the params? You can iterate over all params with
parser.begin()
parser.getNext()

And with that one, I suggest to also support the third param for the
%theirs file.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org