> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: woensdag 15 juni 2011 12:12
> To: dev_at_subversion.apache.org
> Subject: Re: svn commit: r1135635 -
> On Wed, Jun 15, 2011 at 06:55:19AM +0300, Daniel Shahaf wrote:
> > Daniel Shahaf wrote on Wed, Jun 15, 2011 at 06:33:46 +0300:
> > > stsp_at_apache.org wrote on Tue, Jun 14, 2011 at 15:10:50 -0000:
> > > > + svn_stringbuf_appendcstr(buf, _("Local property value:\n"));
> > > > + if (mine_is_binary)
> > > > + svn_stringbuf_appendcstr(buf, _("Cannot display: property
> is "
> > > > + "binary data\n"));
> > >
> > > Could we just print a hex dump of the value?
> > Concretely:
> > [[[
> > but the property has already been locally changed to a different value.
> > Local property value:
> > mine
> > Incoming property value:
> > ]]]
> While I understand your reasoning I think this would be very
> confusing to many users. Not all SVN users are programmers.
> And I guess people will in general be using special tools anyway to view
> such properties. E.g. if the prop value was a PNG image, they will want
> to see the image. A string of hex numbers won't help them much.
> There is precedence here, too. We don't show diffs of binary files,
> we show a placeholder instead that says a diff cannot be shown.
> Would you also prefer svn diff to print a diff of the hex dumps?
> I'd doubt it.
> I'd say let them propget the value and look at it in whatever manner
> they see fit. This is a total edge case anyway. No user using standard
> svn: properties is ever going to run into this.
> > Patch to produce that:
The problem for application builders is that you can't just get the property
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 new conflict store is designed to fix this problem, but that will have
to wait for 1.8.
Received on 2011-06-15 12:22:48 CEST