Bug Report: Diff dialog can show incorrect revisions of files when path names intersect across revisions

Hi Team,

I have recently encountered an issue with the TortiseSVN Merge dialog. I
could not see this issue listed in the change log or on the Issue Tracker.

TortiseSVN Version

I am using the latest TortiseSVN release:

TortoiseSVN 1.4.8, Build 12137 - 32 Bit , 2008/02/16 11:09:38

Subversion 1.4.6, Windows XP.

Bug Description

There appears to be an issue with how TortiseSVN retrieves the contents of a
file for a given revision to display a diff when paths have been moved (such
as /branches/test to /branches/test_moved) and then a copy of the
/branch/trunk is created as /branch/test later on.

Attached is a screenshot of the TortiseMerge dialog showing a supposed
difference between r451 and r452 of a file named test.txt - It shows that
both files contain '2' in their contents.

This is incorrect, revision 451 did have '2', but revision 452 has the
contents of '3'.

svn cat -r 452 file:///c:/svn/test/branches/test/test.txt

2

svn cat -r 452 file:///c:/svn/test/branches/test/test.txt_at_452

3

I believe TortiseMerge in this case should be appending @452 to the Url it
uses to retrieve the contents of the files? At the moment it retrieves '2'
for the contents of r452, not '3'. The result is that no differences are
shown between the files.

The reason this bug appears is apparently due to /trunk/test.txt (which
contains '2') being copied to /branches/test after the path /branches/test
(which had '3') was renamed to /branches/test_moved.

If I use the SVN Checkout GUI and checkout a copy of
file:///C:/svn/test/branches/test <file:///C:\svn\test\branches\test> with
Revision set to 453 then test.txt is checked out with the contents of '3'
which is what I expected.

Attached is a copy of my SVN history for recreating this problem, each time
'Modified' appears for test.txt, I am incrementing the value inside the file
(Starting at 1 when first checked in).

Let me know if you need anything further.

Cheers,

Andrew

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org

• text/plain attachment: svnlog.txt