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

Re: "Compare with working copy" bug

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 05 Aug 2009 10:09:46 +0200

On 04.08.2009 18:32, Igor Nesterov wrote:
> I got a strange result while comparing HEAD with working copy on TortoiseSVN 1.6.3, Build 16613 - 32 Bit.
>
> TortoiseProc is called as
>
> TortoiseProc.exe /command:showcompare /nodekind:3 /url1:"C:\ProjectsSVN\P2ReplUtils\Source" /revision1:WC /url2:"C:\ProjectsSVN\P2ReplUtils\Source" /revision2:521
>
> 521 is the HEAD revision. TortiseProc produces diff file started with
> Index: C:/ProjectsSVN/P2ReplUtils/Source/P2ReplUtils.cpp
> ===================================================================
> --- C:/ProjectsSVN/P2ReplUtils/Source/P2ReplUtils.cpp (revision 521)
> +++ C:/ProjectsSVN/P2ReplUtils/Source/P2ReplUtils.cpp (working copy)
>
> but making the same comparison with older revision produces diff file with reverse order of files
>
> Index: C:/ProjectsSVN/P2ReplUtils/Source/P2ReplUtils.cpp
> ===================================================================
> --- C:/ProjectsSVN/P2ReplUtils/Source/P2ReplUtils.cpp (working copy)
> +++ C:/ProjectsSVN/P2ReplUtils/Source/P2ReplUtils.cpp (revision 512)
>
> TortoiseMerge.exe is called with the same argument order for both cases, but for comparison with r521 it tries to apply diff between r521 and WC to WC and shows strange results.
>
> It seems that something goes wrong.

When you do a diff from the log dialog, it depends on which of the two
selected revisions you right-click on. The clicked revision determines
the 'start' revision.

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=2380333
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-05 10:10:09 CEST

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

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