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

Re: Issue 1493 - property merges should use libsvn_diff

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Fri, 30 Oct 2009 00:03:30 +0100

On Wed, Oct 28, 2009 at 11:37:48PM +0100, C. Michael Pilato wrote:
> > I could create a string from the svn_diff_mem_string_output_merge2()
> > created stream and pass that back to be used in the above code. But
> > would it be a problem to have a diff3 text for some conflicts and the
> > error message for others?
> >
> > Does the diff3 format handle deletes and adds? I first thought that it
> > was just a question of leaving one part of the diff blank but that seems
> > to easy.
> >
> >> Well we just had a good laugh here by modifying your script to set
> >> an SVG image as the property value instead of 'horse'.
> >> I'm not gonna try a PNG because that would probably screw the terminal :)
> >
> > I could write a parser for translating svg files into ascii art when
> > stored as a property. :-)
> Why not change the message to simply refer to files in the working copy
> where the user can examine the various property values for themselves?
> Trying to the value of property 'NAME', but there appears to already
> be a property 'NAME' with the same final value. See NAME.prej.mine
> (or NAME.prej.theirs) for the property value.
> That kinda thing?

That would be better than this output:

Trying to change property 'prop' from 'A
Lines' to 'Some
but the property has been locally changed from 'A
Lines' to 'The

My only concern is for adding extra prej.{mine,theirs} to the directory.
But if they would be automatically cleaned up when the conflict is
resolved then there would be no harm done.

I would feel even better if there was a way to use plain diff3-format
in .prej-files but maybe there is too little to win? How often
do we have long properties spanning multiple lines?


Received on 2009-10-30 00:03:54 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.