[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: Josh Reynolds <josh.reynolds_at_eku.edu>
Date: Wed, 22 Feb 2012 12:56:54 -0500

On 2/22/2012 12:43 PM, Stefan Küng wrote:
> On 21.02.2012 21:16, Josh Reynolds wrote:
>> 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
>

Doh, thank you! I should have read a little closer.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2925522

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-02-22 18:57:03 CET

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