Re: Issue 1493 - property merges should use libsvn_diff

Daniel Näslund wrote:
> On Wed, Oct 28, 2009 at 11:37:48PM +0100, C. Michael Pilato wrote:
>> 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?

[...]

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

Hrm... yeah, I would, too.

> 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?

svn:mergeinfo and svn:ignores are the only of our own properties that do right?

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2412856