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

Re: Tree conflict detection bug/limitation

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 18 Mar 2009 12:04:51 +0000

On Mon, Mar 16, 2009 at 01:46:25PM -0400, Mark Phippard wrote:
> This may be known already. I recall that we knew there were scenarios
> involving folders where TC detection has not been added yet.
> The attached script shows a pretty trivial merge example where it does
> not detect a TC and it seems like we should. Basically, in a branch a
> file is edited and committed. In trunk, the parent folder is renamed
> and committed. Now trunk is merged to the branch. No conflict is
> raised, so the changes to the file on the branch would not be flagged
> as needing to go into the renamed file.

We need deep-tree comparisons to catch this.
We'd need to compare the tree in the working copy to the tree in
the repository @r{merge-left}.

IIRC the current diff implementation does not properly support comparing
a local working copy tree to an arbitrary tree in the repository.
I don't recall exactly what was wrong. Either there is no API for this,
or the API is there but does not return useful results.

Neels is planning to look into this.
It's being tracked as part of issue #3150:

> I think at one point we might
> have talked about "replaying" the rename on the branch so that the
> content was preserved, but that does not seem to be happening either.

Well, that would be a "true rename".
We don't have true renames in 1.6.

Received on 2009-03-18 13:05:20 CET

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