Jonathan Guy
2018-10-30 08:35:12 UTC
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
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