Checkout
Julian Foad
committed
on 18 Oct 12
Rename 'symmetric merge' to 'automatic merge' throughout the code base.

* subversion/include/private/svn_client_private.h
(svn_client__sy… Show more
Rename 'symmetric merge' to 'automatic merge' throughout the code base.

* subversion/include/private/svn_client_private.h

 (svn_client__symmetric_merge_get_locations): Rename to

   svn_client__automatic_merge_get_locations.

* subversion/include/svn_client.h

 (svn_client_symmetric_merge_t, svn_client_find_symmetric_merge,

  svn_client_find_symmetric_merge_no_wc, svn_client_do_symmetric_merge,

  svn_client_symmetric_merge_is_reintegrate_like): Rename to

   svn_client_automatic_merge_t, svn_client_find_automatic_merge,

   svn_client_find_automatic_merge_no_wc, svn_client_do_automatic_merge,

   svn_client_automatic_merge_is_reintegrate_like.

* subversion/libsvn_client/merge.c

 (find_symmetric_merge, svn_client_symmetric_merge_t,

  svn_client_find_symmetric_merge_no_wc, svn_client_find_symmetric_merge,

  do_symmetric_merge_locked, svn_client_do_symmetric_merge,

  svn_client_symmetric_merge_is_reintegrate_like,

  svn_client__symmetric_merge_get_locations): Rename to

   find_automatic_merge, svn_client_automatic_merge_t,

   svn_client_find_automatic_merge_no_wc, svn_client_find_automatic_merge,

   do_automatic_merge_locked, svn_client_do_automatic_merge,

   svn_client_automatic_merge_is_reintegrate_like,

   svn_client__automatic_merge_get_locations.

* subversion/svn/merge-cmd.c

 (symmetric_merge): Rename to automatic_merge.

 (svn_cl__merge): Track the renames.

* subversion/svn/mergeinfo-cmd.c

 (mergeinfo_summary): Track the renames.

* subversion/tests/cmdline/merge_symmetric_tests.py

 Rename to merge_automatic_tests.py, and rename everything inside it too.

Show less