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

"Compare with working copy" bug

From: Igor Nesterov <nest_at_palmoid.com>
Date: Tue, 4 Aug 2009 09:32:45 -0700 (PDT)

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.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-04 18:33:18 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.