Checkout Tools
  • last updated 2 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Change double quotes to single quotes in help messages, for consistency.

* subversion/clients/cmdline/main.c

(svn_cl__options, svn_cl__cmd_table): Change double quotes to single quotes.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Adjust accordingly.

  1. … 1 more file in changeset.
Kind of revert a little part of r13761, which broke building with --enable-dso.

NOTE: This doesn't unbreak --enable-dso on trunk, it is just what needs to be

back-ported to 1.2.x.

* subversion/clients/cmdline/help-cmd.c (svn_cl__help): Don't print FS modules.

* subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout:

Remove FS modules from expected output.

  1. … 1 more file in changeset.
Revert the addition of the "svn version" subcommand (r10430), as there are

strong objections to it in its present form. See this email thread:

http://svn.haxx.se/dev/archive-2005-04/0567.shtml

* subversion/clients/cmdline/help-cmd.c

Revert logically (resolving merge conflicts).

(print_help): Delete, moving contents into svn_cl__help.

(svn_cl__help): Add the body of print_help instead of calling it.

(svn_cl__version): Delete.

* subversion/clients/cmdline/cl.h

* subversion/clients/cmdline/main.c

* subversion/tests/clients/cmdline/getopt_tests.py

* subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn_ver-q_stderr

* subversion/tests/clients/cmdline/getopt_tests_data/svn_ver-q_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stderr

* subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout

Revert directly (no merge conflicts).

  1. … 4 more files in changeset.
URIs have schemes, not schemas. Fix everywhere.

* CHANGES

* doc/misc-docs/quick_walkthrough.xml

* notes/webdav-general-summary

* subversion/bindings/swig/java/org/tigris/subversion/test/SVNTests.java

* subversion/clients/cmdline/main.c

* subversion/libsvn_client/diff.c

* subversion/libsvn_fs_base/lock.c

* subversion/libsvn_fs_fs/lock.c

* subversion/libsvn_ra/ra_loader.c

* subversion/libsvn_ra_dav/props.c

* subversion/libsvn_ra_local/split_url.c

* subversion/tests/clients/cmdline/basic_tests.py

* subversion/tests/clients/cmdline/externals_tests.py

* subversion/tests/clients/cmdline/getopt_tests.py

* subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout

* subversion/tests/clients/cmdline/svntest/main.py

* tools/dev/stress.pl

* win-tests.py

* www/faq.html

  1. … 18 more files in changeset.
Display list of available FS back-end modules in the --version output of the

following programs: svn, svnadmin, svnlook, and svnserve.

API changes: Rename svn_ra_print_ra_libraries2 to svn_ra_print_modules, and

make it append to an existing svn_stringbuf_t, not create a new one.

Add a svn_fs_print_modules, paralleling it for FS modules.

Modify the FS module vtable, adding a get_description function.

***** FS module vtable change. If an old 1.2.0-dev build of libsvn_fs_base

***** is picked up by a new 1.2.0-dev build of libsvn_fs, nasty stuff will

***** happen - probably segfaults.

* subversion/include/svn_fs.h (svn_fs_print_modules): Declare.

* subversion/include/svn_ra.h (svn_ra_print_ra_libraries2): Rename...

(svn_ra_print_modules): ...to this. Amend documentation.

(svn_ra_print_ra_libraries): Amend documentation.

* subversion/libsvn_fs/fs-loader.c

(get_library_vtable): Split much of the logic out into...

(get_library_vtable_direct): ...this new function.

Make the error messages differentiate between the cases of an unknown fs

type, and a known fs type for which the module cannot be loaded.

(svn_fs_print_modules): New function.

* subversion/libsvn_fs/fs-loader.h (fs_library_vtable_t): Expand documentation.

Add get_description member.

* subversion/libsvn_fs_base/fs.c (base_get_description): New function.

(library_vtable): Add the new function.

* subversion/libsvn_fs_fs/fs.c (fs_get_description): New function.

(library_vtable): Add the new function.

* subversion/libsvn_ra/ra_loader.c (svn_ra_print_ra_libraries2): Rename...

(svn_ra_print_modules): ...to this. Append to an existing stringbuf, instead

of creating and returning one. Bugfix - check the version of a loaded RA

module, before accessing its vtable.

(svn_ra_print_ra_libraries): Fix compatibility wrapper to compensate.

* subversion/clients/cmdline/help-cmd.c (print_help):

* subversion/svnadmin/main.c (subcommand_help):

* subversion/svnlook/main.c (subcommand_help):

* subversion/svnserve/main.c (version):

Call svn_fs_print_modules() and display the information.

* subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout:

* subversion/tests/clients/cmdline/getopt_tests_data/svn_version_stdout:

* subversion/tests/clients/cmdline/getopt_tests.py:

Sync with changed output.

  1. … 12 more files in changeset.
Merge locking branch to trunk, by comparing trunkURL with branchURL.

This is not a test. This is an actual addition of a very large feature.

This merge passes 'make check' over all three RA implementations.

To see commit logs for this feature, examine /branches/locking, r11749:13570.

  1. … 182 more files in changeset.
Make 'svn help' output show the client version number.

Review by: Greg Hudson <ghudson@mit.edu>

* subversion/clients/cmdline/help-cmd.c

(svn_cl__help_header): Add a line giving the client version.

Then tweak a wording later on, to save a line, so the total number

of lines in the help output remains the same. This involved

reformatting the source so as to make the strings start in an

earlier column, which in turn makes this change appear more

drastic than it actually is.

(svn_cl__help_footer): Make the same start-column adjustment as

above, for consistency, and remove the extra newline at the end.

No semantic changes.

* subversion/tests/clients/cmdline/getopt_tests.py

(rep_lines_res): Add line to compensate for above.

* subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout,

subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout:

Adjust for new help output.

See http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=80300

<85hdoybiyw.fsf@newton.ch.collab.net> and related thread for more.

  1. … 2 more files in changeset.
Use single quotes in help command output.

* subversion/clients/cmdline/help-cmd.c

(svn_cl__help_header): Use single quotes for commands.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout

Update expected output for tests to match the change in help-cmd.c.

  1. … 1 more file in changeset.
Remove -l alias for svn log's --limit option.

* subversion/clients/cmdline/cl.h

(svn_cl__longopt_t): add svn_cl__limit_opt.

* subversion/clients/cmdline/main.c

(svn_cl__options): replace 'l' with svn_cl__limit_opt.

(svn_cl__cmd_table): replace svn log's 'l' option with svn_cl__limit_opt.

(main): replace 'l' with svn_cl__limit_opt in getopt switch statement.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

(svn help log): update --limit line.

  1. … 2 more files in changeset.
Implement a '--limit' switch for 'svn log', which allows you to limit

the number of log entries returned.

* subversion/include/svn_repos.h

(svn_repos_get_logs3): new prototype, adds a new 'limit' argument to

svn_repos_get_logs2.

(svn_repos_get_logs2): deprecate.

* subversion/libsvn_repos/log.c

(svn_repos_get_logs3): new, implements limit functionality.

(svn_repos_get_logs2, svn_repos_get_logs): implement in terms of new

svn_repos_get_logs3 function.

* subversion/include/svn_client.h

(svn_client_log2): new prototype, adds a new 'limit' argument to

svn_client_log.

(svn_client_log): deprecate.

* subversion/libsvn_client/log.c

(svn_client_log2): new, like old svn_client_log, but now calls the

get_log2 method of the RA layer.

(svn_client_log): reimplement in terms of svn_client_log2.

* subversion/clients/cmdline/cl.h

(svn_cl__opt_state_t): add limit field.

* subversion/clients/cmdline/log-cmd.c

(svn_cl__log): call svn_client_log2 instead of svn_client_log.

* subversion/clients/cmdline/main.c

(svn_cl__options): add limit option.

(main): handle limit option.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

(svn help log): update for new --limit flag.

* subversion/include/svn_ra.h

(svn_ra_plugin_t::get_log2): new, adds a 'limit' argument to get_log.

(svn_ra_plugin_t::get_log): deprecate.

* subversion/libsvn_ra_local/ra_plugin.c

(svn_ra_local__get_log2): new, like svn_ra_local__get_log, but with an

additional 'limit' argument.

(svn_ra_local__get_log): reimplement in terms of svn_ra_local_get_log2.

(ra_local_plugin): add svn_ra_local__get_log2.

* subversion/include/svn_ra_svn.h

(SVN_RA_SVN_UNSPECIFIED_NUMBER): new constant, indicates an optional

number that was not found.

* subversion/libsvn_ra_svn/marshal.c

(vparse_tuple): handle the 'n' case for optional entries in a tuple.

* subversion/libsvn_ra_svn/client.c

(ra_svn_log2): add limit functionality, with fallback in case the server

doesn't respect the limit request.

(ra_svn_log): implement in terms of ra_svn_log2.

(ra_svn_plugin): add ra_svn_log2.

* subversion/svnserve/serve.c

(log_cmd): add limit functionality.

* subversion/libsvn_ra_dav/log.c

(log_baton): add limit and count fields for keeping track of logs we

receive versus how many we're willing to display.

(log_end_element): bail out if we go over the limit of entries we're

going to show.

(svn_ra_dav__get_log2): new, adds limit to old svn_ra_dav__get_log impl.

(svn_ra_dav__get_log): reimplement in terms of svn_ra_dav__get_log2.

* subversion/libsvn_ra_dav/ra_dav.h

(svn_ra_dav__get_log2): prototype.

* subversion/libsvn_ra_dav/session.c

(dav_plugin): add svn_ra_dav__get_log2.

* subversion/mod_dav_svn/log.c

(dav_svn__log_report): parse limit out of request and pass it on to

svn_repos_get_logs2.

  1. … 17 more files in changeset.
New command "svn version [--quiet]".

* subversion/clients/cmdline/cl.h (svn_cl__version): Declare command handler.

(svn_cl__cat): Move to alphabetically correct position in the handler list.

* subversion/clients/cmdline/main.c (svn_cl__cmd_table): Add entry for

the "version" command.

* subversion/clients/cmdline/help-cmd.c (print_help): New function. Extract

implementation from svn_cl__help.

(svn_cl__help) Call print_help to do the actual printing.

(svn_cl__version): New. Call print_help to print version info.

[in subversion/tests/clients/cmdline]

* getopt_tests.py (getopt_version, getopt_ver__q): New tests.

(test_list): Add them to the list.

* getopt_tests_data/svn_help_stdout,

getopt_tests_data/svn--help_stdout: Add "version" command to expected output.

* getopt_tests_data/svn_ver-q_stdout,

getopt_tests_data/svn_ver-q_stderr,

getopt_tests_data/svn_version_stdout,

getopt_tests_data/svn_version_stderr: New files with expected output.

  1. … 4 more files in changeset.
Comply with our own license per clause 3.

Approved by: julianfoad and kfogel

* subversion/libsvn_subr/opt.c

(print_version_info): Add "software developed by CollabNet" line.

* subversion/tests/clients/cmdline/getopt_tests_data/svn--version_stdout

Update tests for new --version output.

  1. … 1 more file in changeset.
Clarify the built-in help text describing 'svn switch --relocate'.

* clients/cmdline/main.c (svn_cl__cmd_table): clarify the built-in

help on 'svn switch' vs. 'svn switch --relocate.'"

* tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout:

update testdata, so that getopt_tests.py passes.

  1. … 1 more file in changeset.
Whatever the reason, it feels like the season

For purging nonsensical goo.

Trade "strict"-ness for stopping on encountered copies

And evenly blame the world, too.

* subversion/clients/cmdline/main.c

(svn_cl__options): Add new --stop-on-copy (svn_cl__stop_on_copy_opt) option.

(svn_cl__cmd_table): Lose the --strict option for 'svn blame' -- it

just doesn't make any sense to support that. Also, use the new

--stop-on-copy option instead of --strict for 'svn log'.

(main): Parse new --stop-on-copy option.

* subversion/clients/cmdline/cl.h

(svn_cl__longopt_t): Sort these, and add new svn_cl__stop_on_copy_opt.

(svn_cl__opt_state_t): Add 'stop_on_copy' member.

* subversion/clients/cmdline/blame-cmd.c

(svn_cl__blame): Update call to svn_client_blame.

* subversion/include/svn_client.h

* subversion/libsvn_client/blame.c

(svn_client_blame): Remove 'strict_node_history' parameter.

* subversion/clients/cmdline/log-cmd.c

(svn_cl__log): Use the --stop-on-copy option instead of --strict.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Update test data.

* subversion/doc/book/book/ch08.xml

Update documentation for --strict and --stop-on-copy.

  1. … 7 more files in changeset.
Fix issue #1596: the cmdline client help for '-r' was confusing.

* subversion/clients/cmdline/main.c

(svn_cl__options): Document that only some commands take ranges.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Adjust accordingly.

  1. … 1 more file in changeset.
More praise for blame.

* subversion/clients/cmdline/main.c (svn_cl__cmd_table): Add 'praise'

as an alias for 'blame'.

* subversion/libsvn_client/blame.c (svn_client_blame): Remove a size

mismatch warning on platforms where apr_off_t is wider than int.

* subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout,

subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout:

Add 'praise' as an alias for for 'svn blame'.

  1. … 2 more files in changeset.
Fix a getopt_test failure caused by ghudson's commit of revision 7568.

* getopt_tests_data/svn_help_log_switch_stdout: Replace 'cross copy' with

'follow copy'.

We say "version control", not "revision control". Changed where the user can

see it: documentation, help and error messages, but not source code comments.

  1. … 20 more files in changeset.
Consistently write "XML" instead of "xml" in help and error messages.

  1. … 2 more files in changeset.
Command-line argument parsing errors: if a recognised but inappropriate option

is found, just display an error message that says how to get help.

This is the same as what we do for an unrecognised option. Don't display the

full help for the subcommand, because that is often long so that the original

command line and error message scroll off the screen, and it gets annoying

after the initial learning period, and it can encourage a habit of relying on

bad syntax (e.g. "svn add") to get help.

* subversion/clients/cmdline/main.c (main)

* subversion/svnadmin/main.c (main)

* subversion/svndumpfilter/main.c (main)

* subversion/svnlook/main.c (main)

For an inappropriate option, display just a simple error message, not help.

Fixed the description for "help help".

Made quoting more consistent in other error messages.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help--version_stdout

Updated accordingly.

  1. … 4 more files in changeset.
Make some help text clearer and more self-consistent.

* doc/book/book/ch03.xml

* doc/book/book/ch08.xml

* subversion/clients/cmdline/main.c (svn_cl__options, svn_cl__cmd_table)

Describe revision specifiers more accurately.

Make some help messages better and more consistent.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help--version_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Updated accordingly.

  1. … 3 more files in changeset.
In the help for "svn log", do not allow multiple local paths because such

usage does not work properly, and specify the default revision range because

it differs between URL and local usage and has confused people.

* doc/book/book/ch08.xml

* subversion/clients/cmdline/main.c

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

In the help for "svn log", do not allow multiple local paths, and specify

the default revision range.

  1. … 2 more files in changeset.
Add 'pd' alias for propdel command to the data files for the getopt

tests. Thanks to Greg Stein for pointing out the error of my ways. :)

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout

Give 'em bread *and* circuses:

* subversion/clients/cmdline/main.c

(svn_cl__cmd_table): Add "annotate" and "ann" aliases for "blame"

subcommand, for CVS compatibility.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout,

subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout:

The usual.

* tools/client-side/bash_completion:

The unusual.

  1. … 2 more files in changeset.
An initial implementation of "svn blame", which is meant to be somewhat

analogous to "cvs annotate".

* subversion/include/svn_client.h

(svn_client_blame_receiver_t): New callback type.

(svn_client_blame): New function prototype.

* subversion/libsvn_client/blame.c

New file.

* subversion/clients/cmdline/cl.h

(svn_cl__blame): New subcommand declaration.

* subversion/clients/cmdline/blame-cmd.c

New file.

* subversion/clients/cmdline/main.c

(svn_cl__cmd_table): Added entry for "blame".

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_stdout

* subversion/tests/clients/cmdline/getopt_tests_data/svn--help_stdout

Updated to reflect new "blame" subcommand.

  1. … 5 more files in changeset.
Provide a fuller usage message for "svn switch". Adjust several usage

messages for consistency.

* subversion/clients/cmdline/main.c (svn_cl__cmd_table)

Edit usage messages.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Edit the expected test output to match the new usage messages.

  1. … 1 more file in changeset.
Write "URL" consistently in upper case, in the Book and in messages that

the user may see (mostly error messages and the output of "svn info").

* doc/book/book/appc.xml

* doc/book/book/ch04.xml

* doc/book/book/ch08.xml

* doc/translations/french/client.texi

* subversion/clients/cmdline/import-cmd.c

* subversion/clients/cmdline/info-cmd.c

* subversion/clients/cmdline/main.c

* subversion/include/svn_error_codes.h

* subversion/libsvn_client/checkout.c

* subversion/libsvn_client/commit_util.c

* subversion/libsvn_client/ls.c

* subversion/libsvn_client/prop_commands.c

* subversion/libsvn_ra_dav/props.c

* subversion/libsvn_wc/entries.c

* subversion/svnadmin/main.c

* subversion/svnlook/main.c

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Change "Url" and "url" to "URL" in user-visible strings.

  1. … 16 more files in changeset.
Fix a message to print the current directory as '.', and change a lot

of backticks to forward ticks.

* subversion/clients/cmdline/propedit-cmd.c

(svn_cl__propedit): Print the dot, instead of an empty string.

* everywhere: Use ' instead of ` in text strings. Leave comments

alone -- fixing them too would make the diff unforgiveably large.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_stderr:

Adjust to expect a forward quote.

Background:

Vincent Lefevre <vincent+svn@vinc17.org> pointed out that

$ svn propedit svn:ignore .

Set new value for property `svn:ignore' on `'

$

should really have said:

Set new value for property `svn:ignore' on `.'

Meanwhile, I noticed that in addition to leaving out the dot, it was

using backquotes instead of forward quotes... :-). Similar problems

with the quotes existed in a lot of other places, too. This change

fixes both problems. I have no explanation for why we say "backtick"

and "backquote" but "forward tick" and "forward quote"; just seems

natural, I guess.

  1. … 53 more files in changeset.
Add a --config-dir option that allows a user's config to be read from

a directory other than the default ~/.subversion.

Patch by: Shlomi Fish <shlomif@vipe.stud.technion.ac.il>

(Tweaked by me.)

* svn_config.h

(svn_config_get_config, svn_config_ensure, svn_config_read_auth_data,

svn_config_write_auth_data): Add config_dir parameter to override

the default ~/.subversion.

* svn_auth.h

(SVN_AUTH_PARAM_CONFIG_DIR): New.

* subversion/libsvn_wc/log.c

(log_do_merge): Removed the call to svn_config_get_config which seems

like a leftover from ancient times.

* subversion/libsvn_subr/config_file.c

(svn_config__user_config_path): Added the config_dir parameter.

(svn_config_ensure): Added the config_dir parameter.

* subversion/libsvn_subr/config.c

(get_category_config): Added the config_dir param and made it override

the other directories in case it is set.

(svn_config_get_config): Added the config_dir param and passed it to

get_category_config

* subversion/libsvn_subr/config_auth.c

(auth_file_path): Added the config_dir param.

(svn_config_read_auth_data): Added and implemented the config_dir param.

(svn_config_write_auth_data): Added and implemented the config_dir param.

* subversion/libsvn_subr/config_impl.h

(svn_config__user_config_path): Added the config_dir parameter.

* subversion/libsvn_client/providers.c

(get_creds): Read the config_dir from the parameters and passed it to

read_auth_data.

(save_creds): Added the config_dir param and passed it to

write_auth_data.

(simple_save_creds): Read the config_dir from the parameters

and passed it to save_creds.

(username_save_creds): Read the config_dir from the parameters

and passed it to save_creds.

* subversion/clients/cmdline/cl.h

(enum svn_cl__longopt_t): Added svn_cl__config_dir_opt member.

(struct svn_cl__opt_state_t): Added config_dir member.

* subversion/svnadmin/main.c

(anonymous enum): Add svnadmin__config_dir.

(options_table): Add "--config-dir" to create command. Tweak help text

to fit in 80 columns and remove some '.'s for consistency.

(main): Added the processing of the config_dir option.

(subcommand_create): added the config_dir param to svn_config_get_config

* subversion/clients/cmdline/main.c

(svn_cl__options): Add "--config-dir".

(svn_cl__cmd_table): Add "--config-dir" to all commands.

(main): Added processing of the svn_cl__config_dir_opt; passed

config_dir to svn_config_get_config and set its paramter in svn_auth.

* subversion/tests/clients/cmdline/basic_tests.py

(basic_add_ignores, basic_import_ignores): Add --config-dir so that

the user's config doesn't affect the tests. Raise the correct exception.

* subversion/tests/clients/cmdline/prop_tests.py

(copy_should_use_copied_executable_and_mime_type_values,

update_conflict_props): Raise the correct exception.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Add --config-dir help text.

* subversion/tests/clients/cmdline/getopt_tests_data/svn_help--version_stdout

Add --config-dir help text.

* tools/client-side/bash_completion

(_svn): Add --config-dir to all commands.

(_svnadmin): Add --config-dir to create command.

  1. … 14 more files in changeset.
Rename 'svn resolve' to 'svn resolved':

* 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.

  1. … 20 more files in changeset.