[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge dry-run and conflict resolution

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 30 Oct 2018 15:29:26 +0100

On Tue, Oct 30, 2018 at 10:27:28AM +0100, Branko Čibej wrote:
> [Moving to dev@ as this is more of a development question.]
> On 30.10.2018 09:35, Jonathan Guy wrote:
> > Hi all
> > Just looking over the code for the interactive conflict resolution.
> > This is just an initial observation but in merge_cmd.c the function svn_cl__merge calls run_merge then checks for a merge tracking error and then checks for conflicts. If there were conflicts it runs the interactive conflict resolver. My question is should the resolver be running if this is a dry-run?
> > Thanks for any clarification on this.
> I think you're correct, since a dry run doesn't (or shouldn't) produce
> any changes in the working copy, it makes no sense to run the resolver.
> -- Brane


Jonathan, would you be able to submit a patch for this issue?
Received on 2018-10-30 15:29:42 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.