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

Re: TortoiseProc diff and showcompare do not show property differences for file nodes

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 12 Dec 2010 10:03:49 +0100

On 02.12.2010 19:30, Thomas S. Trias wrote:
> I am using:
>
> TortoiseSVN 1.6.12, Build 20536 - 32 Bit , 2010/11/24 20:59:01
> Subversion 1.6.15,
> apr 1.3.8
> apr-utils 1.3.9
> neon 0.29.5
> OpenSSL 0.9.8p 16 Nov 2010
> zlib 1.2.3
>
> Assume the following repository at https://mysvn/svn/Test:
>
> /bar/foo.txt
>
> Where foo.txt was changed between revisions 1 and 2 with property changes.
>
> I can compare bar using either of the following commands:
>
> tortoiseproc /command:showcompare /url1:https://mysvn/svn/Test/bar
> /revision1:1 /url2:https://mysvn/svn/Test/bar /revision:2
> tortoiseproc /command:diff /path:https://mysvn/svn/Test/bar /startrev:1
> /endrev:2
>
> Both bring up the Changed Files dialog box; double-clicking on foo.txt
> brings up my external diff viewer (Beyond Compare 3, if that matters)
> and show the text differences and any property differences.
>
> If I compare foo.txt directly:
>
> tortoiseproc /command:showcompare
> /url1:https://mysvn/svn/Test/bar/foo.txt /revision1:1
> /url2:https://mysvn/svn/Test/bar/foo.txt /revision:2
> tortoiseproc /command:diff /path:https://mysvn/svn/Test/bar/foo.txt
> /startrev:1 /endrev:2
>
> I only see the text differences.
>
> The following commands show the property changes in the unified diff output:
>
> tortoiseproc /command:showcompare
> /url1:https://mysvn/svn/Test/bar/foo.txt /revision1:1
> /url2:https://mysvn/svn/Test/bar/foo.txt /revision:2 /unified
> svn diff -r 1:2 https://mysvn/svn/Test/bar/foo.txt
>
> Ideally, the result of double-clicking on foo.txt in the Changed Files
> dialog would be equivalent to performing the diff or showcompare
> directly on foo.txt. We are using Tortoiseproc from a separate program
> to avoid having to have yet another place to configure a diff program
> and to avoid performing the work that TortoiseProc already does.

Done in r20600.

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=2690069
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-12-12 10:40:58 CET

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