Re: Cannot diff after file rename

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.

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.

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).

> 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)

Regards,
Malcolm

---------------------------------------------------------------------
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:04:54 2006