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

Merge dry-run and conflict resolution

From: Jonathan Guy <jonathan.guy_at_ikoder.com>
Date: Tue, 30 Oct 2018 08:35:12 +0000

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.

Jonathan Guy
Received on 2018-10-30 09:35:35 CET

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

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