- changed 7 files
Remove two hacks from the conflict resolver API that were added toallow handling --accept=mine-conflict | working for tree conflictsand --accept=working for binary text conflicts.This patch makes the command-line client fully responsible for choosingthe appropriate conflict option id, and keeps the various new APIssuch as svn_client_conflict_text_resolve_by_id() simple and doingjust what they were told to do.Discussed in https://lists.apache.org/thread.html/de7fc6bdbd100ad2fa89d04e336fd64f8d77f66730ae2806ded1293b@%3Cdev.subversion.apache.org%3E* subversion/libsvn_client/conflicts.c (svn_client_conflict_text_resolve_by_id, svn_client_conflict_tree_resolve_by_id): Remove hacks from these functions.* subversion/svn/conflict-callbacks.c (resolve_conflict_by_accept_option): Inline parts of this function that handle svn_cl__accept_edit and svn_cl__accept_launch ... (svn_cl__resolve_conflict): ...here. Accept svn_cl__accept_t by value, drop the option id argument. Pick the appropriate option id based on the passed-in svn_cl__accept_t argument. Prompt the user if there is no option or if the option did not apply.* subversion/svn/resolve-cmd.c (svn_cl__resolve): Handle unsupported --accept [--non-interactive] cases in this function. (svn_cl__walk_conflicts): Remove the is_resolve_cmd argument. Don't map the --accept option to option id here, as we will do it in the svn_cl__resolve_conflict() function. Adjust calls to walk_conflicts() and svn_cl__resolve_conflict(). (walk_conflicts): Remove option_id argument, accept svn_cl__accept_t by value. (conflict_status_walker): Adjust call to svn_cl__resolve_conflict(). (conflict_status_walker_baton): Remove option_id field, store accept_which field by value.* subversion/svn/merge-cmd.c (svn_cl__merge): Adjust call to svn_cl__walk_conflicts().* subversion/svn/switch-cmd.c (svn_cl__switch): Adjust call to svn_cl__walk_conflicts().* subversion/svn/update-cmd.c (svn_cl__update): Adjust call to svn_cl__walk_conflicts().* subversion/svn/cl.h (svn_cl__resolve_conflict, svn_cl__walk_conflicts): Update declarations.