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

Re: svn commit: r15164 - trunk/notes

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-25 15:39:22 CEST

On Jun 24, 2005, at 11:53 PM, Greg Hudson wrote:
>
> I feel like you're ignoring the result of the IRC discussion, and
> making
> target-baseprops part of the merge. (That is, you're creating a
> four-way merge algorithm instead of a three-way one involving just
> old-baseprops, new-baseprops, and workingprops.) That's not
> consistent
> with how we handle text.

Aha, well I did add a footnote to the document right after the IRC
conversation, take a look. It addresses this very subject, regarding
the exact codepath you quoted:

### FOOTNOTE:

     Our 'svn merge' diagram really suggests using a diff4 algorithm,
     rather than diff3.

     What should we do in the case of a server-propset attempting to
     change PROPNAME from A to B, while the user has locally changed
     the same PROPNAME from C to B?

     The algorithm above suggests that because the two starting values
     (A and C) are unequal, we should flag a conflict. But our current
     diff3 algorithm on lines-of-text may actually not care about the
     target base; it might produce a smooth merge because the *results*
     are the same.

     Need to discuss this more. What does our textual diff3 actually
     do? And is it a good thing to imitate?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jun 25 15:40:25 2005

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