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

Re: Command line paramters for extenal merge tool

From: Lübbe Onken <luebbe.tortoisesvn_at_gmail.com>
Date: Thu, 16 Jan 2014 10:06:47 +0100

PS: the %nqbname, %nqyname %nqtname paramters work.

I set my command line to:
... /dn1:"Projektarchiv:#%nqfname#"#%fname#

and examdiff comes up with:
Projekarchiv:####

so both fname parameters return a blank. I thought this was a proper
three-way-diff?!?

2014/1/16 Lübbe TortoiseSVN <luebbe.tortoisesvn_at_gmail.com>

> Hi Stefan,
>
> Thanks a lot. I just installed Build 25145, but %fname seems to be empty.
>
> my command line is:
> <PathTo>\ExamDiff.exe /merge %theirs %base %mine /o:%merged -nh
> /dn1:"Projektarchiv:%fname" /dn2:"Base:%fname" /dn3:"Arbeitskopie:%fname"
>
> but the screen comes up as:
>
> [image: Inline-Bild 1]
>
> I tried with and without quotes around the parameters. The results are the
> same no matter if I resolve the conflict from the merge dialog or from
> windows explorer.
>
>
> --
> Cheers
> - Lübbe
>
> --
> Please help me get more space on Dropbox :)
> https://www.dropbox.com/referrals/NTIwMzcxNjI5
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net PGP Key ID 0x23F511AB
>

-- 
Cheers
- Lübbe
--
Please help me get more space on Dropbox :)
https://www.dropbox.com/referrals/NTIwMzcxNjI5
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3071668
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].

DiffCaptions2.png
Received on 2014-01-16 10:07:03 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.