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

Re: Cannot diff after file rename

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-02-09 23:57:23 CET

Malcolm Rowe wrote:
> On Thu, Feb 09, 2006 at 09:16:14PM +0000, Simon Large wrote:
>> Malcolm Rowe wrote:
>>> r1 r2 r3
>>> TestB.txt --> TestB.txt > TestB-New.txt
>>> \____________________/
>> Bizarre is the word. Deleting something before an update is different
>> from deleting after an update? And if a commit from someone else gets in
>> between me updating and committing the deletion, then it still breaks. Yuck.
> Huh? The deletion isn't the problem, it's that you're creating a new file
> at r3 that's a copy of a file that's still at r1 in your working copy.
> Then you're trying to trace history back from r3 to r2, but there's
> no related file at r2 (we can only trace backward in history; tracing
> forward wouldn't really be reasonable). Again, see the diagram above.

Sorry, my bad. I was thinking rename and wrote delete.

> Also, other people's commits won't affect this. Your working copy doesn't
> have to be completely up to date, just enough that you don't orphan the
> file like in the diagram above.

I just tried this: update after r1, commit r2 from a different WC,
rename and commit in r3. Behaviour is the same - as you would expect
from your diagram. And the commit doesn't even have to be in the same
folder, just in the same repository. Any bump in the global revision
number between copy and commit will trigger this behaviour, no?

> Like I said, it's not an ideal situation, but I think it's a natural
> outcome of our design (mixed-revision working copies, etc).

OK, I see what you mean. Roll on true file renames. Of course the same
problem will still exist for any copy not made directly in the
repository at HEAD :-/

>> And why does the diff work (albeit possibly as a deletion of all lines
>> and re-addition) in 1.2.3?
> I think that's issue #1970, reported in CHANGES for 1.3.0 as:
> * fixed: fs history algorithm might return wrong objects (issue #1970)

Ah, OK.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 9 23:57:44 2006

This is an archived mail posted to the Subversion Dev mailing list.