Re: Conflict resolver callback design

2013-03-28 Thread Julian Foad
On 15 March, Bert Huijben wrote: > Julian Foad wrote: >>  === Pre-conflict and post-conflict operating modes. >> >>  The problem is basically that we have confused two different operating >>  modes -- with different purposes and requirements -- for such a callback: >> >>    (1) Sometimes we call

RE: Conflict resolver callback design

2013-03-15 Thread Bert Huijben
> -Original Message- > From: Julian Foad [mailto:julianf...@btopenworld.com] > Sent: vrijdag 15 maart 2013 22:01 > To: Subversion Development > Cc: Philip Martin; Stefan Sperling; Bert Huijben > Subject: Conflict resolver callback design > > A long email, for folks interested in conflict