Re: conflict callback API

C. Michael Pilato wrote:
> Ben Collins-Sussman wrote:
>> I've just committed (in r25557) a first draft of the API I'd like to
>> use for interactive conflict callbacks. Please take a look at the new
>> 'conflicts' section of svn_client.h
>
> I like the concept, but in addition to putting a "path" into the
> svn_client_conflict_description_t, I'd recommend putting an "adm_access"
> baton. Otherwise, won't callback implementers will be lacking a vital tool
> for working copy manipulation?

Ooh. Another thought. If Jeremy is still working on the
automatically-resolve-conflicts-this-way-or-that code, would it make the
most sense to do so as an implementation of this conflict resolution API?

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand