Re: Tree conflict resolution considered harmful

Dag-Erling Smørgrav wrote on Wed, Aug 29, 2018 at 12:54:43 +0200:
> Please add an option to disable conflict resolution entirely.

As a hotfix, I think this will do what you need?

Index: subversion/libsvn_client/conflicts.c
===================================================================
--- subversion/libsvn_client/conflicts.c (revision 1838961)
+++ subversion/libsvn_client/conflicts.c (working copy)
@@ -11366,6 +11366,7 @@ conflict_type_specific_setup(svn_client_conflict_t
   svn_boolean_t tree_conflicted;
   svn_wc_conflict_action_t incoming_change;
   svn_wc_conflict_reason_t local_change;
+ return SVN_NO_ERROR;
 
   /* For now, we only deal with tree conflicts here. */
   SVN_ERR(svn_client_conflict_get_conflicted(NULL, NULL, &tree_conflicted,
Received on 2018-08-29 13:11:41 CEST