Re: Fold the merge_automatic API into the existing merge_peg API

2013-04-10 Thread Julian Foad
Julian Foad wrote on 2013-04-01: > TODO: Decide whether to keep or make private or delete the dedicated > 'automatic merge' APIs. The issues are:   * Do we want the API to be a special case of pegged merge, or a     dedicated API?  (I don't want to clutter the API by having both     forms.)  Usi

Re: Fold the merge_automatic API into the existing merge_peg API

2013-04-01 Thread Julian Foad
Branko Čibej wrote: > On 28.03.2013 22:07, Julian Foad wrote: >> Branko Čibej wrote: >>> On 28.03.2013 21:38, Julian Foad wrote: I like the focused API, but I also see how the automatic merge can be considered to fill in a bit of missing functionality that merge_peg ought to p

Re: Fold the merge_automatic API into the existing merge_peg API

2013-03-28 Thread Branko Čibej
On 28.03.2013 22:07, Julian Foad wrote: > Branko Čibej wrote: > >> On 28.03.2013 21:38, Julian Foad wrote: >>> I like the focused API, but I also see how the automatic merge can be >>> considered to fill in a bit of missing functionality that merge_peg ought >>> to >>> provide. >>> >>> Perhaps

Re: Fold the merge_automatic API into the existing merge_peg API

2013-03-28 Thread Julian Foad
Branko Čibej wrote: > On 28.03.2013 21:38, Julian Foad wrote: >> I like the focused API, but I also see how the automatic merge can be >> considered to fill in a bit of missing functionality that merge_peg ought to >> provide. >> >> Perhaps we can have both.  Teach merge_peg to DTRT in this c

Re: Fold the merge_automatic API into the existing merge_peg API

2013-03-28 Thread Branko Čibej
On 28.03.2013 21:38, Julian Foad wrote: > Now with a patch for discussion. > > (More below...) > > Julian Foad wrote: >>> Brane told me that while updating the JavaHL API he noticed that the new >>> svn_client_merge_automatic() is Yet Another Merge API, and would prefer make >>> the existing JavaHL

Re: Fold the merge_automatic API into the existing merge_peg API

2013-03-28 Thread Julian Foad
Now with a patch for discussion. (More below...) Julian Foad wrote: >> Brane told me that while updating the JavaHL API he noticed that the new >> svn_client_merge_automatic() is Yet Another Merge API, and would prefer make >> the existing JavaHL merge API encompass that functionality rather than

Re: Fold the merge_automatic API into the existing merge_peg API

2013-03-27 Thread Mark Phippard
On Wed, Mar 27, 2013 at 12:18 PM, Julian Foad wrote: > Brane told me that while updating the JavaHL API he noticed that the new > svn_client_merge_automatic() is Yet Another Merge API, and would prefer make > the existing JavaHL merge API encompass that functionality rather than add > yet anoth

Re: Fold the merge_automatic API into the existing merge_peg API

2013-03-27 Thread Branko Čibej
On 27.03.2013 17:18, Julian Foad wrote: > Brane told me that while updating the JavaHL API he noticed that the new > svn_client_merge_automatic() is Yet Another Merge API, and would prefer make > the existing JavaHL merge API encompass that functionality rather than add > yet another variant. S