On Wed, Feb 29, 2012 at 08:19:52AM -0500, Greg Stein wrote: > The editor interface is not for merging. It is for *applying* the results > of a merge, to a stateful representation of a tree to alter that held state.
Sorry, but I still don't understand how you want to solve the problem. You seem to be saying that we shouldn't be loocking for a solution in the Ev2 API. So where should we look? How will the merge driver you speak of decide whether or not to flag a tree conflict in the delete vs. delete case under discussion? And where will the merge driver run? Right now, we have delta_dirs() on the server as the merge driver. How will that change with Ev2?
