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

Re: props during tree-conflicts -- was: svn commit: r39054 - branches/1.6.x

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 2 Sep 2009 12:54:51 +0100

On Wed, Sep 02, 2009 at 01:28:12PM +0200, Neels Janosch Hofmeyr wrote:
> Stefan Sperling wrote:
> > * STATUS: Add r39052 to the r38000 group.
>
> [[[
> + ### A/B/E gets both a property and tree conflict flagged. Is this OK?
> ]]]
>
> IMHO, in theoretical terms, it isn't.
>
> The picture is this: On the left, I have a directory with some properties. I
> delete that directory along with its properties, and create a new one with
> different properties.
>
> On the right, I changed a property, not aware that the whole directory was
> being replaced.
>
> By coincidence, a new property on the left has the same name as the modified
> property on the right.
>
> The tree-conflict is "a level higher" than the prop "conflict". The property
> mod is in fact the reason for the tree-conflict. But, with interactive
> conflict resolution, the user is *first* asked to deal with the property
> conflict and is told only later that the entire directory was in fact being
> replaced. That's not very nice.

Yeah, there's a problem here, but it cannot be fixed within the r38000
group. I'd say let's just file an issue for this and deal with it later.

Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2390148
Received on 2009-09-02 13:55:46 CEST

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