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

Re: delete callback in editorv2 and tree conflicts

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 29 Feb 2012 23:49:26 +0100

On Wed, Feb 29, 2012 at 05:30:51PM -0500, Greg Stein wrote:
> But the short answer is: we have no design for conflict management in
> Ev2. Thus, there will be a ton of out-of-band communication between
> the merge process and the underlying state. Both reading, and writing
> conflict information.

OK. That stance makes sense given recent discussion about how
conflicts should be stored during update/merge, and then processed
later in a separate step.

In Ev1, we keep trying to make important decisions about conflicts
while the edit is in progress. And that is not working out well at all.

Instead, we'll need to design conflict storage such that it can store
all information streaming in via the editor for later processing when
a delete vs. delete conflict is detected. The conflict resolver will
then need some way to request any additional information it needs in
order to make smart decisions.

So, agreed. I'm happy with leaving Ev2 out of this business.
Received on 2012-02-29 23:50:03 CET

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