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

Re: conflict callback API

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-07-09 22:54:11 CEST

+1!

On Thu, 28 Jun 2007, Jeremy Whitlock wrote:

> Hi All,
> I love this new approach. Let me look at the code and I will
> submit a new patch that takes my previous automatic conflict
> resolution stuff and use the new stuff from Ben.
>
> Take care,
>
> Jeremy
>
> On 6/28/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> >On 6/28/07, C. Michael Pilato <cmpilato@collab.net> wrote:
> >
> >> > 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?
> >
> >Ah, great idea. That's a vital tool, indeed.
> >
> >>
> >> 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?
> >
> >Yes, I've been trying to express that idea for the last few weeks. :-)
> >
> >---------------------------------------------------------------------
> >To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> >For additional commands, e-mail: dev-help@subversion.tigris.org
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

  • application/pgp-signature attachment: stored
Received on Mon Jul 9 22:53:53 2007

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