Re: [RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-29 Thread Julian Foad
I (Julian Foad) wrote on 2012-01-25: > Stefan Sperling wrote: >> I filed the issue. I think I had in mind that we'd store multiple >> conflicts, but I'm not quite sure. >> >> I agree with your plans to deal with the non-interactive --accept case. In r1440193 I did that, closing issue #4238.

Re: [RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-25 Thread Paul Burba
On Fri, Jan 25, 2013 at 12:32 PM, Paul Burba wrote: > On Fri, Jan 25, 2013 at 12:11 PM, Paul Burba wrote: >> On Thu, Jan 24, 2013 at 5:16 PM, Julian Foad >> wrote: >>> Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per >>> file, rather than (as it does now) postponing all

Re: [RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-25 Thread Paul Burba
On Fri, Jan 25, 2013 at 12:11 PM, Paul Burba wrote: > On Thu, Jan 24, 2013 at 5:16 PM, Julian Foad > wrote: >> Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per >> file, rather than (as it does now) postponing all conflicts until after the >> whole merge and then resolvi

Re: [RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-25 Thread Paul Burba
On Thu, Jan 24, 2013 at 5:16 PM, Julian Foad wrote: > Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per > file, rather than (as it does now) postponing all conflicts until after the > whole merge and then resolving them. > > > I have been investigating the way "--accept=fo

Re: [RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-25 Thread Julian Foad
Stefan Sperling wrote: > I filed the issue. I think I had in mind that we'd store multiple > conflicts, but I'm not quite sure. > > I agree with your plans to deal with the non-interactive --accept case. > > I have one concern about the interactive case where no --accept option > was passed, whi

Re: [RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-24 Thread Stefan Sperling
On Thu, Jan 24, 2013 at 10:16:16PM +, Julian Foad wrote: > Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per > file, rather than (as it does now) postponing all conflicts until after the > whole merge and then resolving them. > > > I have been investigating the way "-

Re: [RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-24 Thread Julian Foad
I (Julian Foad) wrote: > Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per > file, rather than (as it does now) postponing all conflicts until after the > whole merge and then resolving them. [...] > I think a good enough solution for 1.8 is this: [...] >   * [...] let the

[RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-24 Thread Julian Foad
Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per file, rather than (as it does now) postponing all conflicts until after the whole merge and then resolving them. I have been investigating the way "--accept=foo" resolves conflicts, for blocker issue #4238 "merge -cA,B wi