Checkout Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Get rid of the ever increasing number of private apis in svn_sorts.h by adding

a new private/svn_sorts_private.h file with the private parts and updating the

needed #include-s.

*AND*

Improve error reporting during xml parsing in ra_serf a bit.

For 1.9 the number of private apis in this public header more than doubled,

doubling the original filesize, while our policy is to never add private

functions in public headers.

* build.conf

(libsvn_subr): Add export.

* subversion/include/private/svn_sorts_private.h

New file, copied from ../svn_sorts.h.

* subversion/include/svn_sorts.h

Remove everything possible in our private namespace. Keeping some

references.

* subversion/libsvn_client/diff_local.c

* subversion/libsvn_client/import.c

* subversion/libsvn_client/info.c

* subversion/libsvn_client/list.c

* subversion/libsvn_client/merge.c

* subversion/libsvn_client/mergeinfo.c

* subversion/libsvn_client/status.c

* subversion/libsvn_delta/compat.c

* subversion/libsvn_fs_fs/cached_data.c

* subversion/libsvn_fs_fs/index.c

* subversion/libsvn_fs_fs/low_level.c

* subversion/libsvn_fs_fs/pack.c

* subversion/libsvn_fs_fs/temp_serializer.c

* subversion/libsvn_fs_fs/transaction.c

* subversion/libsvn_fs_x/index.c

* subversion/libsvn_fs_x/low_level.c

* subversion/libsvn_fs_x/pack.c

* subversion/libsvn_fs_x/transaction.c

* subversion/libsvn_ra/compat.c

* subversion/libsvn_ra_serf/inherited_props.c

* subversion/libsvn_ra_serf/lock.c

* subversion/libsvn_repos/dump.c

* subversion/libsvn_repos/fs-wrap.c

* subversion/libsvn_subr/cmdline.c

* subversion/libsvn_subr/hash.c

* subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/sorts.c

* subversion/libsvn_wc/adm_ops.c

* subversion/libsvn_wc/diff_editor.c

* subversion/libsvn_wc/status.c

* subversion/libsvn_wc/wc_db.c

* subversion/libsvn_wc/wc_db_update_move.c

* subversion/mod_dav_svn/repos.c

* subversion/svn/log-cmd.c

* subversion/svn/propget-cmd.c

* subversion/svnadmin/svnadmin.c

* subversion/svnlook/svnlook.c

* subversion/tests/libsvn_subr/priority-queue-test.c

* subversion/tests/libsvn_wc/op-depth-test.c

Fix includes.

* subversion/libsvn_ra_serf/util.c

(expat_response_handler): Combine XML errors with our custom parser errors

instead of only reporting one or the other.

  1. … 42 more files in changeset.
Add a private lookup API for sorted arrays. This one is easier

to use than svn_sort__bsearch_lower_bound as it will return

actual matches only, i.e. requires less post-processing for

certain callers.

* subversion/include/svn_sorts.h

(svn_sort__array_lookup): Declare the new private API function.

* subversion/libsvn_subr/sorts.c

(svn_sort__array_lookup): Implement it.

* subversion/libsvn_fs_fs/index.c

(get_p2l_entry_from_cached_page,

svn_fs_fs__p2l_entry_lookup): Simplify using the new API.

* subversion/libsvn_fs_x/index.c

(get_p2l_entry_from_cached_page,

p2l_entry_lookup): Ditto.

  1. … 3 more files in changeset.
svn_sort__* private API normalization. In functions with no return

argument, make the container the first parameter. Update all callers.

* subversion/include/svn_sorts.h

(svn_sort__bsearch_lower_bound,

svn_sort__array_insert): Move the ARRAY parameter to the front.

* subversion/libsvn_subr/sorts.c

(svn_sort__bsearch_lower_bound,

svn_sort__array_insert): Update implementation signatures.

* subversion/libsvn_client/merge.c

(slice_remaining_ranges,

insert_child_to_merge,

normalize_merge_sources_internal): Update API callers.

* subversion/libsvn_fs_fs/index.c

(get_p2l_entry_from_cached_page,

svn_fs_fs__p2l_entry_lookup): Same.

* subversion/libsvn_fs_fs/pack.c

(find_first_reference): Same.

* subversion/libsvn_fs_fs/transaction.c

(verify_moves): Same.

* subversion/libsvn_fs_x/index.c

(get_p2l_entry_from_cached_page,

p2l_entry_lookup): Same.

* subversion/libsvn_fs_x/transaction.c

(verify_moves): Same.

* subversion/libsvn_ra/compat.c

(svn_ra__get_inherited_props_walk): Same.

* subversion/libsvn_ra_serf/inherited_props.c

(get_iprops_via_more_requests): Same.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_get_inherited_props): Same.

* subversion/libsvn_subr/mergeinfo.c

(adjust_remaining_ranges,

svn_rangelist_merge2): Same.

* subversion/libsvn_wc/wc_db.c

(db_read_inherited_props): Same.

* tools/server-side/fsfs-stats.c

(find_representation,

parse_representation): And finally the same here.

  1. … 13 more files in changeset.
Merge fsx branch into /trunk with no conflicts.

Remove BRANCH-README.

  1. … 83 more files in changeset.
Merge the docstring improvement of r1471208 from /branches/fsfs-format7.

No functional change.

  1. … 1 more file in changeset.
* subversion/include/svn_sorts.h

(svn_sort__array_reverse): Note in docstring that this is private.

(The name should reveal as much, but other functions in this

header call this sort of thing out explicitly.)

* subversion/include/svn_sorts.h

(svn_sort__array_reverse): Update the doc string following r1445980.

Introduce svn_sort__array_reverse(), and use it in svn_rangelist_reverse()

which should now be more efficient because it was previously swapping the

pointed-to structures rather than just the pointers.

* subversion/include/svn_sorts.h,

subversion/libsvn_subr/sorts.c

(svn_sort__array_reverse): New function.

* subversion/libsvn_subr/mergeinfo.c

(svn_rangelist_reverse): Use it.

  1. … 2 more files in changeset.
* subversion/include/svn_path.h

(svn_path_compare_paths): Extend comment.

* subversion/include/svn_sorts.h

(svn_sort_compare_items_as_paths): Extend comment.

  1. … 1 more file in changeset.
Docstring improvements for qsort() callers.

* subversion/include/svn_diff.h

(svn_patch_t.hunks):

* subversion/include/svn_sorts.h

(svn_sort_compare_paths, svn_sort_compare_ranges):

* subversion/include/svn_delta.h

(svn_delta_path_driver):

* subversion/libsvn_client/client.h

(svn_client__sort_commit_item_urls):

Improve docstrings.

  1. … 3 more files in changeset.
* subversion/include/svn_sorts.h

(svn_sort__bsearch_lower_bound, svn_sort__array_insert,

svn_sort__array_delete): Add doxygen markup to docstrings. Explicitly

mark these functions as private. I don't really like the fact that

they are declared in a public header, but there is precedent for doing

so in this file, and moving them to a different header would cause

more code churn than it's worth.

* subversion/include/svn_sorts.h

(svn_sort__array_delete): Fix documentation typo.

Follow-up to r1180154: svn_rangelist_merge2 optimization.

Suggested by: philip

* subversion/include/svn_sorts.h

(svn_sort__array_delete): Add an argument specifying the number of elements

to delete.

* subversion/libsvn_client/merge.c

(remove_absent_children,

remove_children_with_deleted_mergeinfo): Update calls to

svn_sort__array_delete.

* subversion/libsvn_subr/mergeinfo.c

(adjust_remaining_ranges): Make a single call to svn_sort__array_delete

rather than iterating over each deleted element.

* subversion/libsvn_subr/sorts.c

(svn_sort__array_delete): Add an argument specifying the number of elements

to delete.

  1. … 3 more files in changeset.
Tweak the svn_rangelist_merge2 API so it allocates new svn_merge_range_t

elements only when absolutely necessary.

This addresses a serious inefficiency in memory usage when

svn_mergeinfo_catalog_merge, svn_mergeinfo_merge2, or svn_rangelist_merge2

are called in a loop. Prior to this change svn_rangelist_merge2 could

potentially reallocate *every* range in both rangelists.

For example, the peak working set memory for the reintegrate merge described

here http://svn.haxx.se/dev/archive-2011-09/0254.shtml was 1,324,664 KB

with trunk@1179545. With this commit that drops to 26,880 KB.

* subversion/include/svn_sorts.h

(svn_sort__array_delete): New.

* subversion/libsvn_subr/sorts.c

(svn_sort__array_delete): New, moved here from

subversion/libsvn_client/merge.c:remove_element_from_array.

* subversion/libsvn_client/merge.c

(remove_element_from_array): Remove -- replacing it with

svn_sort__array_delete.

(remove_absent_children,

remove_children_with_deleted_mergeinfo): Replace remove_element_from_array

with svn_sort__array_delete.

* subversion/libsvn_subr/mergeinfo.c

(adjust_remaining_ranges): New.

(svn_rangelist_merge2): We are not creating a new rangelist, so modify

the output rangelist in-place as much as possible. Previously we used

combine_with_lastrange, which happily reallocated most of the ranges

in both rangelists. This is fine for the other callers (i.e.

svn_rangelist_intersect, svn_rangelist_remove, and

svn_mergeinfo__filter_mergeinfo_by_ranges) which are allocating a new

output argument, but not for svn_rangelist_merge2 which is *not*

allocating a new rangelist.

* subversion/tests/libsvn_subr/mergeinfo-test.c

(test_rangelist_merge): Add some new test cases to exercise all the code

paths in svn_rangelist_merge2 and adjust_remaining_ranges.

  1. … 4 more files in changeset.
* subversion/include/svn_sorts.h

(svn_sort__hash): Fix error in docs.

Fix some Doxygen mark-up.

* subversion/include/svn_diff.h

(svn_hunk_t): Use '@verbatim' for diff hunk examples, as Doxygen was

interpreting some mark-up and doing some formatting inside '<pre>'.

(svn_diff_file_options_t): Use double quotes rather than single quotes to

avoid Doxygen converting '@@' to '@'.

(svn_diff_hunk_reset_*, svn_diff_hunk_get_*): Enable Doxygen.

* subversion/include/svn_props.h

(SVN_PROP_BOOLEAN_TRUE): Enable Doxygen.

(SVN_PROP_EXTERNALS, SVN_PROP_WC_PREFIX): Use '<pre>' instead of

'@verbatim' temporarily to work around a Doxygen bug in which it failed

to recognize the #define and all subsequent ones, issuing messages like

'warning: documentation for unknown define XXX found.'.

* subversion/include/svn_ra_svn.h

(svn_ra_svn_write_tuple): Use '@code' for a C code example, to give nicer

display than '@verbatim'.

* subversion/include/svn_sorts.h

(svn_sort_compare_items_as_paths): Use '@code' for a C code example and

remove embedded mark-up that was being displayed literally.

* subversion/include/svn_wc.h

(svn_wc_add4): Use double quotes rather than single quotes to avoid

Doxygen misinterpreting '@rev' as an invalid command.

(svn_wc_notify_t): Enable Doxygen on recently added members.

(svn_wc_conflict_action_t, svn_wc_conflict_choice_t): Enable Doxygen on the members.

  1. … 4 more files in changeset.
Add "const" to all "apr_array_header_t *" input parameters in public and

private APIs.

(Note that we are allowed to add "const" to a pointer parameter of a public

API, and have done so before, because that is a backward-compatible API

change and doesn't change the ABI at all.)

The public functions whose prototypes are changed are listed individually

below; the private functions are not.

* subversion/include/svn_auth.h

(svn_auth_open)

* subversion/include/svn_client.h

(svn_client_get_commit_log_t,

svn_client_copy5,

svn_client_copy4,

svn_client_move5,

svn_client_patch)

* subversion/include/svn_delta.h

(svn_delta_path_driver,

svn_file_rev_handler_t,

svn_file_rev_handler_old_t)

* subversion/include/svn_fs.h

(svn_fs_change_txn_props)

* subversion/include/svn_mergeinfo.h

(svn_rangelist_diff,

svn_rangelist_merge,

svn_rangelist_remove,

svn_rangelist_intersect,

svn_rangelist_inheritable2,

svn_rangelist_inheritable,

svn_rangelist_dup)

* subversion/include/svn_opt.h

(svn_opt_args_to_target_array3,

svn_opt_args_to_target_array2,

svn_opt_args_to_target_array,

svn_opt_eat_peg_revisions)

* subversion/include/svn_ra.h

(svn_ra_file_rev_handler_t,

svn_ra_get_locations,

svn_ra_plugin_t.get_locations)

* subversion/include/svn_ra_svn.h

(svn_ra_svn_command_handler,

svn_ra_svn_set_capabilities,

svn_ra_svn_parse_tuple,

svn_ra_svn_parse_proplist)

* subversion/include/svn_repos.h

(svn_repos_file_rev_handler_t,

svn_repos_trace_node_locations,

svn_repos_fs_get_mergeinfo,

svn_repos_fs_change_txn_props,

svn_repos_remember_client_capabilities)

* subversion/include/svn_sorts.h

(svn_sort__bsearch_lower_bound)

* subversion/include/svn_string.h

(svn_cstring_match_glob_list)

* subversion/include/svn_wc.h

(svn_wc_get_status_editor3,

svn_wc_get_update_editor4,

svn_wc_get_update_editor3,

svn_wc_get_switch_editor4,

svn_wc_get_switch_editor3,

svn_wc_match_ignore_list)

* subversion/include/private/svn_cmdline_private.h

* subversion/include/private/svn_opt_private.h

* subversion/libsvn_client/blame.c

* subversion/libsvn_client/client.h

* subversion/libsvn_client/commit.c

* subversion/libsvn_client/commit_util.c

* subversion/libsvn_client/copy.c

* subversion/libsvn_client/deprecated.c

* subversion/libsvn_client/merge.c

* subversion/libsvn_client/mergeinfo.c

* subversion/libsvn_client/mergeinfo.h

* subversion/libsvn_client/patch.c

* subversion/libsvn_client/ra.c

* subversion/libsvn_delta/compat.c

* subversion/libsvn_delta/path_driver.c

* subversion/libsvn_fs_base/reps-strings.c

* subversion/libsvn_fs_base/revs-txns.c

* subversion/libsvn_fs_base/revs-txns.h

* subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/fs_fs.h

* subversion/libsvn_fs/fs-loader.c

* subversion/libsvn_fs/fs-loader.h

* subversion/libsvn_ra/compat.c

* subversion/libsvn_ra/ra_loader.c

* subversion/libsvn_ra/ra_loader.h

* subversion/libsvn_ra/wrapper_template.h

* subversion/libsvn_ra_local/ra_plugin.c

* subversion/libsvn_ra_neon/get_locations.c

* subversion/libsvn_ra_neon/props.c

* subversion/libsvn_ra_neon/ra_neon.h

* subversion/libsvn_ra_serf/getlocations.c

* subversion/libsvn_ra_serf/ra_serf.h

* subversion/libsvn_ra_svn/client.c

* subversion/libsvn_ra_svn/cyrus_auth.c

* subversion/libsvn_ra_svn/editorp.c

* subversion/libsvn_ra_svn/internal_auth.c

* subversion/libsvn_ra_svn/marshal.c

* subversion/libsvn_ra_svn/ra_svn.h

* subversion/libsvn_repos/fs-wrap.c

* subversion/libsvn_repos/log.c

* subversion/libsvn_repos/repos.c

* subversion/libsvn_repos/repos.h

* subversion/libsvn_repos/rev_hunt.c

* subversion/libsvn_subr/auth.c

* subversion/libsvn_subr/cmdline.c

* subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/opt.c

* subversion/libsvn_subr/sorts.c

* subversion/libsvn_subr/svn_string.c

* subversion/libsvn_wc/adm_ops.c

* subversion/libsvn_wc/deprecated.c

* subversion/libsvn_wc/diff.c

* subversion/libsvn_wc/status.c

* subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/util.c

* subversion/mod_dav_svn/dav_svn.h

* subversion/mod_dav_svn/reports/file-revs.c

* subversion/mod_dav_svn/util.c

* subversion/svn/cl.h

* subversion/svn/props.c

* subversion/svn/switch-cmd.c

* subversion/svn/util.c

* subversion/svndumpfilter/main.c

* subversion/svnserve/serve.c

* subversion/tests/libsvn_repos/repos-test.c

* subversion/tests/libsvn_subr/mergeinfo-test.c

  1. … 78 more files in changeset.
Test out my new and fancy ASF commit priviledges by changing the copyright

wording in our license headers to reflect ownership by the ASF.

* NOTICE:

Change terminology to ASF, and update a link.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the ASF, and update the project website.

* everywhere:

Change license text to reflect ASF ownership.

  1. … 891 more files in changeset.
Relicense Subversion under the Apache License, Version 2.0.

* NOTICE: New.

* LICENSE: New.

* COPYING,

subversion/LICENSE: Remove.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the SVN Corp, and that it contains contributions from

many people, as referenced in NOTICE.

* subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS:

Relicense the SVN parts under Apache 2.0.

* everywhere:

Change copyright notices in file headers to reflect the Apache 2.0 license.

  1. … 882 more files in changeset.
Adjust a bunch of our public header files:

- make sure everything the header needs is included

- make sure nothing is included which is NOT needed

Added an exception to svn_types.h: it now explicitly includes svn_error.h

since Everybody needs that thing. We go ahead and make it easy for them,

even though that is counter-philosophy.

After altering the header files, some .c files in our codebase would not

compile -- they used stuff that they did not explicitly include. Thus, a

goodly number of .c files were updated, too.

* subversion/libsvn_ra/wrapper_template.h:

* subversion/libsvn_ra/deprecated.c:

* subversion/libsvn_ra/compat.c:

* subversion/libsvn_subr/iter.c:

* subversion/libsvn_subr/cmdline.c:

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c:

* subversion/libsvn_subr/error.c:

* subversion/libsvn_subr/auth.c:

* subversion/libsvn_subr/opt.c:

* subversion/libsvn_subr/checksum.c:

* subversion/libsvn_subr/compat.c:

* subversion/libsvn_subr/sha1.c:

* subversion/libsvn_subr/deprecated.c:

* subversion/libsvn_subr/ssl_server_trust_providers.c:

* subversion/mod_dav_svn/activity.c:

* subversion/mod_dav_svn/reports/log.c:

* subversion/tests/libsvn_fs/fs-test.c:

* subversion/tests/libsvn_repos/repos-test.c:

* subversion/svn/list-cmd.c:

* subversion/svn/changelist-cmd.c:

* subversion/svn/log-cmd.c:

* subversion/svn/conflict-callbacks.c:

* subversion/libsvn_fs_base/dag.c:

* subversion/libsvn_fs_base/util/fs_skels.c:

* subversion/include/svn_dirent_uri.h:

* subversion/include/svn_error_codes.h:

* subversion/include/svn_fs.h:

* subversion/include/svn_diff.h:

* subversion/include/svn_sorts.h:

* subversion/include/svn_mergeinfo.h:

* subversion/include/svn_base64.h:

* subversion/include/svn_dso.h:

* subversion/include/svn_ra_svn.h:

* subversion/include/svn_repos.h:

* subversion/include/svn_delta.h:

* subversion/include/svn_path.h:

* subversion/include/svn_subst.h:

* subversion/include/svn_xml.h:

* subversion/include/svn_props.h:

* subversion/include/svn_iter.h:

* subversion/include/svn_types.h:

* subversion/include/svn_config.h:

* subversion/include/svn_string.h:

* subversion/include/svn_io.h:

* subversion/include/svn_wc.h:

* subversion/include/svn_cmdline.h:

* subversion/include/svn_client.h:

* subversion/include/svn_user.h:

* subversion/include/svn_hash.h:

* subversion/include/svn_md5.h:

* subversion/include/svn_error.h:

* subversion/include/svn_pools.h:

* subversion/include/private/svn_log.h:

* subversion/include/svn_time.h:

* subversion/include/svn_utf.h:

* subversion/include/svn_auth.h:

* subversion/include/svn_ra.h:

* subversion/include/svn_opt.h:

* subversion/include/svn_checksum.h:

* subversion/libsvn_wc/deprecated.c:

* subversion/libsvn_wc/util.c:

* subversion/libsvn_wc/merge.c:

* subversion/libsvn_wc/tree_conflicts.c:

* subversion/libsvn_client/list.c:

* subversion/libsvn_client/log.c:

* subversion/libsvn_ra_neon/util.c:

* subversion/libsvn_ra_neon/log.c:

* subversion/libsvn_repos/deprecated.c:

* subversion/libsvn_fs_fs/tree.c:

* subversion/libsvn_fs_fs/fs_fs.c:

(): adjust #include statements appropriately

  1. … 69 more files in changeset.
Fix code formatting in some headers.

* subversion/include/svn_cmdline.h:

* subversion/include/svn_compat.h:

* subversion/include/svn_ctype.h:

* subversion/include/svn_diff.h:

* subversion/include/svn_md5.h:

* subversion/include/svn_nls.h:

* subversion/include/svn_pools.h:

* subversion/include/svn_props.h:

* subversion/include/svn_quoprint.h:

* subversion/include/svn_sorts.h:

* subversion/include/svn_time.h:

* subversion/include/svn_types.h:

* subversion/include/svn_version.h:

* subversion/include/svn_xml.h: Place function types on separate lines.

  1. … 13 more files in changeset.
Factor out some generic array manipulation logic from the code that handles

CHILDREN_WITH_MERGEINFO arrays.

Create functions for searching and inserting in a generic sorted APR array.

Replace the search function find_child_or_parent() and the insertion

function insert_child_to_merge() with functions that do the same jobs using

the generic helpers. Stop requiring the caller to remember the index where

the next item should be inserted, as that is error-prone.

* subversion/libsvn_client/merge.c

(compare_merge_path_t_as_paths): Move this function to an earlier point in

the source file. Add a doc string.

(get_child_with_mergeinfo): New function.

(find_child_or_parent, find_child_with_mergeinfo): Delete.

(insert_child_to_merge): Re-write.

(insert_parent_and_sibs_of_sw_absent_del_entry, get_mergeinfo_paths,

process_children_with_new_mergeinfo): Adjust for the above changes,

eliminating the indexes.

* subversion/libsvn_client/mergeinfo.c,

subversion/libsvn_client/mergeinfo.h

(svn_client__merge_path_dup): New function.

* subversion/include/svn_sorts.h

(svn_sort__bsearch_lower_bound, svn_sort__array_insert): New functions.

* subversion/libsvn_subr/sorts.c

(bsearch_lower_bound): New function.

(svn_sort__bsearch_lower_bound, svn_sort__array_insert): New functions.

  1. … 4 more files in changeset.
Fix Doxygen typos.

* include/svn_sorts.h

(svn_sort_compare_ranges): Fix references to arguments in the doc string.

Merge tracking related public API doc string improvements.

* subversion/include/svn_sorts.h

(svn_sort_compare_ranges): Be more explicit about behavior and

restrictions.

* subversion/include/svn_types.h

(svn_merge_range_t): Probably terribly obvious, but be explicit about what

we mean by forward and reverse merge ranges -- terms we use all over

merge.c.

  1. … 1 more file in changeset.
Doxygen cleanup.

* subversion/include/*.h:

Convert false, true, and null to FALSE, TRUE and NULL.

  1. … 21 more files in changeset.
More documentation work: Replace selected uses of <pre> in our doxygen markup

with the more generic @verbatim tag.

* subversion/include/svn_sorts.h,

subversion/include/svn_ra_svn.h,

subversion/include/svn_props.h,

subversion/include/svn_types.h:

Use @verbatim in place of <pre> tags.

  1. … 3 more files in changeset.
Channeling Erik Hülsmann, remove all trailing whitespace within our source

tree:

for extsn in c h cpp java py pl rb; do

sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`

done

Inspired by: ehu

  1. … 449 more files in changeset.
Move definition of MAX() and MIN() macros into appropriate header file.

* subversion/include/svn_sorts.h

(MAX, MIN): Add macro definitions.

* subversion/libsvn_subr/mergeinfo.c

(MAX, MIN): Remove macro definitions.

Reviewed by: kfogel

  1. … 1 more file in changeset.
Merge the merge-tracking branch to trunk.

See notes/merge-tracking.txt for work remaining. Copy test #11,

"working-copy to repository copy", is known to be failing over ra_dav.

A fix has been outlined, and it will be coded up ASAP.

  1. … 85 more files in changeset.
Improve a doc-comment.

* subversion/include/svn_sorts.h

(svn_sort_compare_items_as_paths): Actually define what sort order

this sort function provides, and increase the prominence of the

requirement for null-terminated keys.