[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: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2005-06-25 06:53:08 CEST

On Fri, 2005-06-24 at 15:08 -0500, sussman@tigris.org wrote:
> + old-baseprops target-baseprops
> + | |
> + | (server-propsets) | (localedit-propsets)
> + | |
> + v v
> + new-baseprops workingprops

> + if PROPNAME doesn't exist in target-baseprops:

> + else: /* PROPNAME exists in target-baseprops */

> + if (value of PROPNAME in target-baseprops) != FROM:

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.

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

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