Checkout
stsp
committed
on 23 Jan
Add two resolver options for 'dir move vs dir move upon merge' conflicts.

These new options work similar to their existing counterparts for… Show more
Add two resolver options for 'dir move vs dir move upon merge' conflicts.

These new options work similar to their existing counterparts for files.

* subversion/include/svn_client.h

 (svn_client_conflict_option_both_moved_dir_merge,

  svn_client_conflict_option_both_moved_dir_move_merge): Declare.

* subversion/libsvn_client/conflicts.c

 (resolve_both_moved_dir_merge,

  resolve_both_moved_dir_move_merge): New resolution option handlers.

 (svn_client_conflict_tree_get_resolution_options,

  configure_option_both_moved_dir_merge): Enable new options on applicable

  tree conflicts.

 (svn_client_conflict_option_get_moved_to_repos_relpath_candidates2,

  svn_client_conflict_option_set_moved_to_repos_relpath2,

  svn_client_conflict_option_get_moved_to_abspath_candidates2,

  svn_client_conflict_option_set_moved_to_abspath2): Handle new options.

* subversion/svn/conflict-callbacks.c

 (builtin_resolver_options): Assign resolver menu keys to the new options.

* subversion/tests/libsvn_client/conflicts-test.c

 (test_merge_dir_move_vs_dir_move,

  test_merge_dir_move_vs_dir_move_accept_move, test_funcs): Add new tests.

 (create_dir_move_vs_dir_move_merge_conflict): New helper for above tests.

Show less