* subversion/clients/cmdline/main.c
(svn_cl__cmd_table): Change the command name.
* subversion/include/svn_wc.h
(svn_wc_notify_resolved): Replaces svn_wc_notify_resolve.
* subversion/clients/cmdline/feedback.c
(notify): Adjust notification code.
* subversion/libsvn_wc/adm_ops.c
(resolve_conflict_on_entry): Adjust notification.
* subversion/libsvn_client/resolved.c
(svn_client_resolved): Rename file and function, from
resolve.c:svn_client_resolved.
* subversion/clients/cmdline/resolved-cmd.c
(svn_cl__resolved): Rename file and function, from
resolve-cmd.c:svn_cl__resolved.
* subversion/clients/cmdline/cl.h, subversion/include/svn_client.h:
Adjust for above renames.
Tests:
* subversion/tests/clients/cmdline/basic_tests.py
(basic_conflict): Adjust.
* subversion/tests/clients/cmdline/prop_tests.py
(update_conflict_props): Adjust.
* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout,
subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout:
Adjust.
Documentation:
* doc/book/book/ch08.xml, subversion/clients/cmdline/man/svn.1: Adjust.
Bindings:
* subversion/bindings/java/javahl/native/SVNClient.cpp
(SVNClient::resolved): Replace SVNClient::resolve, invoke
svn_client_resolved now.
* subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.cpp
(Java_org_tigris_subversion_javahl_SVNClient_resolved): Replaces
Java_org_tigris_subversion_javahl_SVNClient_resolved, etc.
* subversion/bindings/java/javahl/native/Notify.cpp
(Notify::onNotify): Adjust notification action.
* subversion/bindings/java/javahl/native/SVNClient.h
(class SVNClient): The method name is 'resolved' now.
* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(SVNClient:resolved): Replaces SVNClient:resolve.
* subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java
(Notify::onNotify): Use resolved for action code and name.
