Re: svn commit: r1135635 - /subversion/trunk/subversion/libsvn_wc/props.c

On Wed, Jun 15, 2011 at 12:22:13PM +0200, Bert Huijben wrote:
> The problem for application builders is that you can't just get the property
> here.
>
> You can get the new BASE version of the property and the new ACTUAL version
> of the property (which is usually the old actual property on property
> conflicts), but you can't access the other property values (read: ORIGINAL)
> as you don't know the old revision. (Unless you captured it somewhere before
> the operation)
>

I see, but how is this problem solved by putting a hexdump into
the prej file?

I think that property conflicts aren't being represented very well even
in internal data structures. E.g. in svn_wc_conflict_description2_t some
unrelated field is being used to store the path to the prej file (a
comment added by you points this out).

> The new conflict store is designed to fix this problem, but that will have
> to wait for 1.8.

I also think it is too late now to change any of this for 1.7.
But it needs some serious work for 1.8.
Received on 2011-06-15 12:53:06 CEST