Checkout Tools
  • last updated 5 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1136114 is being indexed.

* Followup r1134219: Use 'cmp -s' instead of 'diff' to

detect changes to svn_private_config.h. Take advantage of the fact

that cmp -s produces no output even if a file does not exist.

Use a temp variable to shorten the lines further.

* notes/api-changes-1.7.txt: Update.
Fix doc strings.

* subversion/include/svn_wc.h

(svn_wc_has_binary_prop): Move the mention of replacement functionality

into the '@deprecated' clause.


SVN_WC_ENTRY_THIS_DIR): Mark as deprecated.

(svn_wc_ensure_adm3): Add a reference to the relevant api-errata file.

(svn_wc_get_status_editor5): Correct the documentation of pool usage.

(svn_wc_dirents_func_t): Add missing Doxygen mark-up.

(svn_wc_get_pristine_props): Remove an obsolete '###' comment.

Factor out a function.

* subversion/include/private/svn_fs_util.h,


(svn_fs__append_to_merged_froms): New, factored out of libsvn_fs_*/tree.c.

* subversion/libsvn_fs_base/tree.c

(append_to_merged_froms): Removed.

(txn_body_get_mergeinfo_for_path): Adjust caller.

* subversion/libsvn_fs_fs/tree.c

(append_to_merged_froms): Removed.

(get_mergeinfo_for_path): Adjust caller.

Simplify both the FSFS and BDB versions of 'get_mergeinfo_for_path', in the

same way, by factoring out the mergeinfo parsing to a single place in each


* subversion/libsvn_fs_base/tree.c

(txn_body_get_mergeinfo_for_path): Simplify.

* subversion/libsvn_fs_fs/tree.c

(get_mergeinfo_for_path): Simplify. Correct a parameter name in doc string.

* site/publish/download/download.html

Move the selected="selected" inside the start element for ftp.

Fix issue #3919. During a merge of a property, add a check against the

incoming new property value and the working copy value. If they

already match, then the merge trivially succeeds.

* subversion/libsvn_wc/props.c

(apply_single_generic_prop_change): Do nothing if the incoming new

property value already matches the working value.

Patch by: Brian Neal <>


* site/publish/download/download.html

Attempt to make the default mirror selection match the preferred one.

Fix issue 3920, wq refers to file that does not exist.

* subversion/libsvn_wc/merge.c

(detranslate_wc_file): Don't set del_on_pool_cleanup if FORCE_COPY

is given, put temporary file in wcroot temp dir.

(preserve_pre_merge_files): Add wq item to delete detranslated file.

* subversion/libsvn_wc/workqueue.c

(run_file_copy_translated): Allow source file to be missing.

Fully deprecate some half-deprecated mergeinfo functions.

* subversion/include/svn_mergeinfo.h

(svn_rangelist_inheritable, svn_mergeinfo_inheritable): Deprecate. (Their

implementations are already in libsvn_subr/deprecated.c.)

* subversion/libsvn_client/mergeinfo.c

(svn_client__get_wc_mergeinfo): Update to use svn_mergeinfo_inheritable2()

instead of svn_mergeinfo_inheritable().

* subversion/libsvn_fs_base/tree.c

(txn_body_get_mergeinfo_for_path): Same.

* subversion/libsvn_fs_fs/tree.c

(get_mergeinfo_for_path): Same.

* subversion/include/svn_diff.h

(svn_diff_fns_t): Re-document this deprecated struct in terms of the

differences between it and its successor.

Rename the new SVN_..._COMPRESSION_LEVEL constants to have a common prefix.

* subversion/include/svn_delta.h





(svn_txdelta_to_svndiff2): Track the rename in the doc string.

* subversion/include/svn_ra_svn.h

(svn_ra_svn_create_conn): Same.

* subversion/libsvn_delta/svndiff.c

(svn_txdelta_to_svndiff2, svn_txdelta_to_svndiff): Track the rename.

* subversion/libsvn_fs_fs/fs_fs.c

(rep_write_get_baton): Same.

* subversion/libsvn_ra_svn/client.c

(handle_child_process_error, make_tunnel, open_session): Same.

* subversion/libsvn_ra_svn/marshal.c

(svn_ra_svn_create_conn): Same.

* subversion/mod_dav_svn/mod_dav_svn.c

(svn__compression_level, SVNCompressionLevel_cmd): Same.

* subversion/svnrdump/dump_editor.c

(apply_textdelta): Same.

* subversion/svnserve/main.c

(main): Same.

* subversion/svnserve/server.h

(serve_params_t): Same.

* subversion/libsvn_wc/merge.c

(eval_conflict_func_result): Rename pool to scratch_pool, no functional


Fix up some public API changes since v1.6. Move a constant back to the

header where it was, and fix up some deprecation mark-up.

* subversion/include/svn_client.h

(svn_client_merge3, svn_client_merge_peg3, svn_client_export4): Add a


(svn_client_mergeinfo_log_merged, svn_client_mergeinfo_log_eligible): Add

a reference to the replacement function svn_client_mergeinfo_log()

within the '@deprecated' clause.

(SVN_INFO_SIZE_UNKNOWN): Move to here ...

* subversion/include/svn_types.h

(SVN_INFO_SIZE_UNKNOWN): ... from here, reverting r1097240, following

r1133417 which moved the corresponding structure.

* subversion/include/svn_ra.h

(svn_ra_get_mergeinfo): Add a missing 'SVN_DEPRECATED'.

* subversion/include/svn_fs.h

(svn_fs_get_mergeinfo): Add a missing 'SVN_DEPRECATED' and correct the

previous version mentioned in the '@deprecated' clause.

* subversion/include/svn_repos.h

(svn_repos_fs_get_mergeinfo2): Same.

* subversion/tests/cmdline/svntest/

(text_base_path): Adjust comments.

Revert r1135442. While 'include virtual' may be recommended for CGIs, it

may not pass the original query string to them, while 'exec cgi' does.

For more information, see:

No logical change. Whitespace only.

* subversion/libsvn_ra_serf/util.c:

(conn_setup): remove comments about unsupported serf version. fix

indentation, add some braces, and wrap long lines.

Remove the session's bucket allocator, since it is unused.

* subversion/libsvn_ra_serf/ra_serf.h:

(svn_ra_serf__session_t): remove BKT_ALLOC

* subversion/libsvn_ra_serf/serf.c:

(svn_ra_serf__open): remove initialization of BKT_ALLOC

* subversion/libsvn_ra_serf/util.c:

(svn_ra_serf__context_run_wait): remove some debug code for BKT_ALLOC

* subversion/libsvn_ra_serf/update.c:

(finish_report): remove some debug code for BKT_ALLOC

(end_report): unrelated change, switching FOUND localvar to boolean

Resolve issue #3589 "file externals can break commits of WC->WC copies" and

at the same time undo the performance regression this would cause by passing

the checksum and tmpdir from the callers that do a svn_wc__db_read_info()


* subversion/libsvn_wc/copy.c

(copy_pristine_text_if_necessary): Add two arguments to avoid a database

query. Assume pristines are always keyed by a sha1 checksum.

(copy_versioned_file): Add two arguments to avoid db lookups. Update caller.

(copy_versioned_dir): Forward tmpdir_abspath. Fetch checksum for files. Check

for file externals and don't copy these: neither versioned, nor unversioned.

(svn_wc_copy3): Update caller.

Allow svn_io_is_binary_data() to accept any kind of pointer without type

casts. A follow-up to r1135575 and r1135655.

* subversion/include/svn_io.h,


(svn_io_is_binary_data): Take 'const void *' instead of 'const unsigned

char *'.

* subversion/libsvn_wc/props.c

(prop_conflict_from_skel): Remove type casts.

* subversion/libsvn_wc/props.c

(prop_conflict_from_skel): Explicitly cast the buffer passed to

svn_io_is_binary_data() to unsigned to avoid a compiler warning.

Found by: philip

With ra_neon unlocking a file would succeed on the client side

even if the pre-unlock hook prevents the unlock. Fix to make sure

failed unlock error is always returned to the user.

* subversion/libsvn_ra_neon/lock.c

(do_unlock): Always return any error.

* subversion/tests/cmdline/

(block_unlock_if_pre_unlock_hook_fails): New test.

(test_list): Add block_unlock_if_pre_unlock_hook_fails to the list.

Patch by: Vijayaguru G <vijay{_AT_}>

* subversion/libsvn_wc/props.c

(prop_conflict_from_skel): If any property value involved in the conflict

is binary data do not generate a conflict diff. Also refrain from writing

binary data to the reject file, and print a readable placeholder instead.

Avoid a potential crash by using an uninitialized variable.

* subversion/libsvn_client/util.c

(svn_client__path_relative_to_root): When getting the repos_relpath, do so

in the temp variable, to ensure it is defined later.

* subversion/include/svn_repos.h

(enum svn_repos_notify_warning_t): Remove trailing comma for strict C89


* subversion/libsvn_subr/cache-membuffer.c

(svn_cache__membuffer_cache_create): Remove a redundant statement.

* tools/client-side/svnmucc/svnmucc.c

(execute): Remove an unneeded path computation.

* subversion/libsvn_client/status.c

(svn_client__create_status): Remove a redundant statement.

Extract the heuristic that detects binary data from svn_io_detect_mimetype2()

into a separate utility, svn_io_is_binary_data().

The greater plan is to detect whether data in svn: properties is binary.

We need this information when creating reject files for properties,

and also to offer more options during interactive conflict resolution of

property conflicts (currently only mine-full and theirs-full are supported,

which is suboptimal for multi-line properties like svn:ignore or svn:externals).

* subversion/include/svn_io.h

(svn_io_is_binary_data): Declare.

* subversion/libsvn_subr/io.c

(svn_io_detect_mimetype2): Call svn_io_is_binary_data().

(svn_io_is_binary_data): New, extracted from svn_io_detect_mimetype2().

* build/generator/templates/vcnet_vcxproj.ezt

Make it a bit easier to locate the debug symbols of the Visual Studio 2010

binaries by naming them after the binary and placing them in the output

instead of intermediate directory.