Re: Tree conflict resolution considered harmful

On Thu, Aug 30, 2018 at 06:15:58AM +0000, Chris wrote:
> By the way, if I remember correctly, --quiet works to stop the resolver, but --non-interactive did not.

This is correct. I misremembered how this was implemented.

The reason that the resolver runs in --non-interactive mode is that we
want it to resolve tree conflicts during automated merges.
In --non-interactive mode the default value for --accept is 'recommended'.
This allows users to run test merges on CI infrastructure and
have some tree conflicts resolved automatically. Conflicts for
which automated resolution is impossible will be postponed.

The reason --quiet suppresses the resolver is an unintended side-effect.
In --quiet mode no notification callback is passed to libsvn_client.
However, the 'svn' client relies on notifications to obtain a list of
conflicted paths after an update/merge/switch operation, and it won't
invoke the resolver if there are no conflicted paths.

The "official" way to prevent the resolver from running is --accept=postpone
Received on 2018-08-30 14:06:37 CEST