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

Re: Using tortoiseproc to open tortoisemerge automatically?

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 22 Feb 2012 18:43:34 +0100

On 21.02.2012 21:16, Josh Reynolds wrote:
> I'm trying to figure out how to use the command line switches for
> tortoiseproc to cause tortoisemerge to open up and show me my working
> copy modifications to a file automatically, so I can run it as an
> external tool from within my code editor. I use editplus for most of my
> php coding needs, and it would be useful to be able to hit ctrl-3 and
> immediately see my modifications to the current file. Editplus calls
> them "user tools", most other editors have similar capabilities.
>
>
> I played around with tortoiseproc.exe /command:showcompare and got this
> to almost work:
>
> "c:\Program Files\TortoiseSVN\bin\TortoiseProc.exe" /command:showcompare
> /url1:d:\temp\testsvn\blahnewfile.cs /revision1:BASE
> /url2:d:\temp\testsvn\blahnewfile.cs /revision2:
>
> d:\temp\testsvn\blahnewfile.cs is a file with local modifications, but
> it just shows me the diff between the base and base revisions, so no
> changes. Is there a way to specify "working copy version" for
> /revision2, similar to how BASE can be used?
>
> I'm still on tortoise 1.6.16 btw.

"showcompare" uses urls, and your passing *paths* to it.

What you want to use is the 'diff' command:

tortoiseproc /command:diff /path:"d:\temp\testsvn\blahnewfile.cs"

That's it.
As the docs for the 'diff' command say:
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-automation.html#tsvn-automation-basics

"If /path2 is omitted, then the diff is done between the file in /path
and its BASE. To explicitly set the revision numbers use /startrev:xxx
and /endrev:xxx, and for the optional peg revision use /pegrevision:xxx."

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2925521
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-22 18:43:46 CET

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