[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: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 27 Oct 2009 23:09:40 +0100

On Tue, Oct 27, 2009 at 10:28:54PM +0100, Daniel Näslund wrote:
> I have some questions about the three way diffs of properties.
> When digging into the merge code for issue 1493 I found that it does use
> svn_diff_mem_string_diff3() and svn_diff_mem_string_output_unified() in
> libsvn_wc/props.c (maybe_generate_propconflict). I suppose the issue
> should be closed then?
> On the other hand I haven't been able to view the resulting three way
> diff! If I choose 'diff-full' in the interactive conflict resolutioner I
> get this:
> [[[
> Conflict for property 'prop' discovered on '/tmp/wc2/foo'.
> Select: (p) postpone,
> (mf) mine-full, (tf) theirs-full,
> (s) show all options: df
> Invalid option; there's no merged version to diff.

No idea what's going wrong here yet, but it certainly doesn't look

> ]]]
> For a property conflict I get theese files:
> [[[
> ? foo.prej
> C foo
> ]]]
> Where foo.prej contains:
> [[[
> Trying to change property 'prop' from 'dog' to 'horse',
> but the property has been locally changed from 'dog' to 'cat'.
> ]]]

Isn't that the best 3-way diff format ever?

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 :)

> Wouldn't it be better to have a three way diff text in foo.prej instead?

Definitely. We might want to make sure the content isn't binary
before printing a diff.


Received on 2009-10-27 23:10:00 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.