[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: Greg Stein <gstein_at_gmail.com>
Date: Wed, 29 Feb 2012 08:09:57 -0500

On Feb 29, 2012 8:01 AM, "Stefan Sperling" <stsp_at_elego.de> wrote:
> On Wed, Feb 29, 2012 at 07:27:46AM -0500, Greg Stein wrote:
> > I'm not sure this has anything to do with Ev2. The editor is for making
> > actual changes; ie. examine the merge sources, and if acceptable, then
> > call svn_editor_delete() to perform the deletion. The merge logic is in
> > *driver*, not the receiver.
> The driver is not omniscient. It needs to pass information that allows
> the receiver to make informed decisions.
> The question is what information the receiver really needs and how much
> the driver can provide upfront to prevent the receiver from having
> to go through extra RA round-trips to obtain required information.
> I'm happy to discuss solutions that don't involve Ev2, of course.
> So how would you solve the problem at hand?

The driver *is* omniscient. It knows the exact state of the tree being
manipulated via Ev2. It is instructing the holder of that tree state to
make certain changes to it. That is all Ev2 does. Change state upon
instruction to do so.

The driver needs to decide the target state, then call the right Ev2
functions to effect those changes.

The merge decisions occur in the driver.

Received on 2012-02-29 14:10:31 CET

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