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

Issue 1493 - property merges should use libsvn_diff

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Tue, 27 Oct 2009 22:28:54 +0100

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.
]]]

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'.
]]]

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

I'm attaching the script I used for testing the merge.

Daniel Nslund

Received on 2009-10-27 22:29:14 CET

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