subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Sperling <s...@elego.de>
Subject Re: [PATCH] Suppress conflict resolver in dry-run merge
Date Fri, 02 Nov 2018 09:34:54 GMT
On Thu, Nov 01, 2018 at 05:38:48PM +0100, Branko ─îibej wrote:
> On 01.11.2018 17:25, Stefan Sperling wrote:
> > While many SVN operations support a dry-run mode, at present the conflict
> > resolver does not. It might actually be nice to see what the resolver would
> > do while in dry-run mode. A dry-run merge could show the result of successful
> > resolution in cases where a recommended resolution option exists, rather
> > than showing a conflict. For instance, a merge to the new location of a
> > moved item could be shown, instead of showing a conflict at the old location.
> 
> Wouldn't that only work if the nature of the conflict was recorded
> somewhere in the working copy? And wouldn't recording it be exactly
> opposite of what 'svn merge --dry-run' really means?

Indeed, the resolver only reads such information from on-disk working
copy state. So this idea would probably not be worth the effort.

Mime
View raw message