Re: RFC: interactive conflict resoution callback

On Fri, 08 Jun 2007, John Peacock wrote:

> Daniel Rall wrote:
> >svk can probably invoke conflict resolution on an as-needed basis
> >without network I/O, because the repository is local.
>
> A careful design should allow conflict resolution to be invoked only
> after the network I/O has been completed, i.e.
>
> 1) merge automatically until
> 2) hit conflict, make note of it and keep the new file from the server
> 3) repeat 1 until completed
> 4) give the user a chance to resolve conflicts (or just mark files as
> conflicted if --non-interactive flag is passed).

As I mentioned in another email in this thread (we probably crossed in
the ether), #2 often won't be possible, in light of a clashing tree
conflict.

> It isn't impossible to do without interfering with the network I/O, but
> it probably would require that [complete] rewrite of the WC code that
> everyone dreads... :(

It would be unfortunate to have to spool up the delta reports for
'update' (as we do for 'merge').