kameshj in subversion

* COMMITTERS: Changed my e-mail address.

* tools/client-side/

New mergeinfo sanitizer script.

Patch by: Prabhu Gnana Sundar <prabhugs{_AT_}>

Tweaked/Reviewed by: me

* STATUS: Moving the fix for issue 3957 to Approved section.

* STATUS: Vote for issue 3957. script would now work for self-signed ssl servers too

* tools/examples/

(main): added few auth providers to enable authenticating

against self-signed ssl servers too (in interactive mode).

(prompt_func_ssl_unknown_cert): new callback function

(prompt_func_simple_prompt): new callback function

Patch by: Prabhu Gnana Sundar <prabhugs{_AT_}>

Reviewed by: me

It has 2 changes.

When creating a repo svnadmin sends the 'config' parameter which is never used

since the 1.0.x and populating 'config' by reading from path where the user

lacks read-access causes vague permission error, hence passing NULL.

Remove the newly introduced(r1080198) --config-option parameter.

* subversion/svnadmin/main.c

(subcommand_create): Passed NULL instead of the 'config' value since it is

never used.

Pretty much revert r1080198 except for retaining named enum and one more

utf8 conversion unrelated to --config-option.

Patch by: Prabhu Gnana Sundar <prabhugs{_AT_}>

Suggested by: markphip


Propose r939000 r939002 r1102803 for backport.

Provide a meaningful error for write through proxy setup.

* subversion/mod_dav_svn/reports/update.c

(dav_svn__update_report): Detect the write through proxy set up

and provide a meaningful error.

Patch by: cmpilato

Reviewed by: kameshj

Fix for issue3870 "File descriptor leaks during svnsync".

Before this fix, all of destination delta editor's interfaces

are called with *LONG* living pool(dst_rev_pool living for one full revision).

This makes it a memory bloat and bloat of other OS resources like

file descriptors to live as long the dst_rev_pool.

* subversion/libsvn_ra_serf/replay.c

(replay_context_t.file_pool): New pool of file scope.

(start_replay): clear the file_pool.

Use file_pool for dest editor's file operations.

(end_replay): Use file_pool for dest editor's file operations.

(svn_ra_serf__replay, svn_ra_serf__replay_range):

Create a new pool 'replay_ctx->file_pool'.

* subversion/tests/cmdline/

(fd_leak_sync_from_serf_to_local): Remove XFail marker.

Patch by: kameshj

Arwin Arni <arwin{_AT_}>

* subversion/tests/cmdline/

Add a test-case to showcase an out-of-date slave related issue #3680.

Patch by: Arwin Arni <arwin{_AT_}>

Fix the regression issue triggered by r917523.

The revision r917523 do some url encodings to the paths and uris which are

not url-encoded. But there is one additional url-encoding of an uri which is

already encoded. With this extra encoding, committing a path to slave which has

space in it fails.

* subversion/tests/cmdline/

Add a testcase for a regression issue triggered by r917523.

* subversion/mod_dav_svn/mirror.c

(dav_svn__location_header_filter): Remove redundant url-encoding of new_uri.

Patch by: Vijayaguru G <vijay{_AT_}>

Fix docstring.

* subversion/tests/cmdline/

(dry_run_merge_conflicting_binary): Fix a typo in

docstring at the same time shorten it for 50 char limitation.

Found by: stsp

Adds an XFail test to catch regression created by r1075802

* subversion/tests/cmdline/

(dry_run_merge_conflicting_binary): New XFail testcase.

(test_list): Add dry_run_merge_conflicting_binary.

Patch by: Arwin Arni <arwin{_AT_}>

Update log_access_verdict to make it work with HTTPD 2.3.x as well as older

server versions with reference to [1]. The function is being called

with APLOG_MARK in few places. The macro APLOG_MARK expands to 2 arguments

till HTTPD-2.2.x but 3 arguments in HTTPD-2.3-dev, which causes failure

while compiling with HTTPD-2.3-dev. So we need to handle both the cases.

case 1 HTTPD 2.3:


1.APLOG_USE_MODULE is used to indirectly set APLOG_MODULE_INDEX and APLOG_MARK.

2.The macros LOG_ARGS_SIGNATURE and LOG_ARGS_CASCADE are expanded as formal and

actual arguments to log_access_verdict with respect to APLOG_MARK which has

one additonal parameter module_index through which we can take the advantage of

per-module loglevel configuration introduced in HTTPD 2.3.

case 2 pre-HTTPD 2.3:



make the code compatible with older server versions.

* subversion/mod_authz_svn/mod_authz_svn.c

(log_access_verdict): Make the macro LOG_ARGS_SIGNATURE as formal parameter

and use LOG_ARGS_CASCADE as actual parameter from the callers.


Patch by: Vijayaguru G <vijay{_AT_}>

Suggested by: kameshj

Follow-up to r1069791. Fix deprecated calls of svn_config_read.

* subversion/libsvn_subr/config.c

(read_all, svn_config_merge):

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

(test_memcache_basic, test_memcache_longkey):

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

(test_text_retrieval, test_boolean_retrieval, test_has_section):

* subversion/svnserve/serve.c


* subversion/libsvn_fs_fs/fs_fs.c


Fixed callers.

Patch by: Arwin Arni <arwin{_AT_}>

Fix Issue #3781 (Case sensitive authz).

* subversion/tests/cmdline/

(case_sensitive_authz): Removed XFail decorator.

* subversion/include/svn_config.h

(svn_config_create) : Documented new parameter.

(svn_config_read) : Deprecated.

(svn_config_read2) : New function prototype, updated documentation.

* subversion/libsvn_subr/config_impl.h

(svn_config_t): Added a new boolean called section_names_case_sensitive.

* subversion/libsvn_subr/deprecated.c

(svn_config_read): New function that calls svn_config_read2

with section_names_case_sensitive as FALSE.

* subversion/libsvn_subr/config.c

(svn_config_create): Added a parameter section_names_case_sensitive

which is used to initialize the config.


svn_config_set) : Added logic to make section names case sensitive.

(svn_config_read) : Deprecated.

(svn_config_read2) : New function that deprecates svn_config_read.

Accepts a boolean section_names_case_sensitive,

and populates the section names case sensitively

if TRUE.

* subversion/libsvn_repos/authz.c

(svn_repos_authz_read) : Fixed the caller with

section_names_case_sensitive as TRUE.

* subversion/tests/cmdline/atomic-ra-revprop-change.c

(construct_config) : Fixed call of svn_config_create.

Patch by: Arwin Arni <arwin{_AT_}>

Follow-up to r1068411

* subversion/tests/cmdline/

(case_sensitive_authz): Now handles the svnserve errors too.

Prior to this commit the expected error was more specific to the http

protocol and testing minute error codes which are *not* a real

concern for this test.

Patch by: Prabhu Gnana Sundar <prabhugs{_AT_}>

Found by: rhuijben

XFail testcase for the issue 3781

* subversion/tests/cmdline/

(case_sensitive_authz): New XFail test for the issue 3781

(test_list): Add case_sensitive_authz.

Patch by: Prabhu Gnana Sundar <prabhugs{_AT_}>

Tweaked by: kameshj

Revert r1064093.

Let us go back to partial case sensitiveness(for commits) and partial case

insensitiveness(for reads) till we have a proper fix for always

case sensitive.

* subversion/libsvn_repos/authz.c

(authz_get_any_access_parser_cb): Use strncmp() instead of strncasecmp()

Fix for Issue #3781 repo prefix rules in authz section is checked case

sensitively for write operations

* subversion/libsvn_repos/authz.c

(authz_get_any_access_parser_cb): Use strncasecmp() instead of strncmp()

Patch by: me

Arwin Arni <arwin{_AT_}>

Reverted in r1064729

* /site/publish/docs/release-notes/1.7.html: Remove redundant 'which'.
Make a mention of '--version' in help command output.

Sanitize 'invalid' options passed after '--version' command.

* subversion/svnrdump/svnrdump.c

(struct opt_baton_t): New member 'version'.

(help_cmd): Now "svnrdump help" would display a better header.

(main) : Sanitize invalid options passed to "svnrdump --version".

Patch by: Prabhu Gnana Sundar <>

Suggested by: kameshj

Tweaked by: kameshj

Fix svn upgrade segfault when it upgrades a WC with items scheduled for


* subversion/libsvn_wc/entries.c

(write_entry): When a item is scheduled its text_base_info is NULL, so

before dereferencing text_base_info check whether it is NULL or not.

* subversion/tests/cmdline/

(test_list): Remove XFail marker on 'upgrade_with_scheduled_change'.

Prefix an underscore to the error messages to make it visible to the


* subversion/libsvn_subr/auth.c

* subversion/svn/util.c

* subversion/svn/propget-cmd.c

* subversion/libsvn_client/delete.c

* subversion/libsvn_client/repos_diff.c

* subversion/svnlook/main.c

* subversion/libsvn_ra_serf/auth_digest.c

* subversion/libsvn_ra_serf/auth.c

* subversion/libsvn_ra_serf/util.c

* subversion/libsvn_ra_serf/win32_auth_sspi.c

* subversion/libsvn_ra_serf/commit.c

* subversion/libsvn_ra_neon/util.c

Patch by: Vijayaguru G <vijay{_AT_}>

Suggested by: kameshj

Tweaked by: kameshj

Adds an XFail test of wc-upgrade(1.6-wc+scheduled_change to 1.7-wc).

* subversion/tests/cmdline/upgrade_tests_data/upgrade_with_scheduled_change.tar.bz2

New file.

* subversion/tests/cmdline/

(upgrade_with_scheduled_change): New XFail testcase.

Patch by: Arwin Arni <arwin{_AT_}>

Removed unused function parameters.

* subversion/libsvn_wc/update_editor.c

(accumulate_last_change): Removed 'svn_wc__db_t *db'

and 'const char *local_abspath' from function signature.

(close_directory, close_file, svn_wc_add_repos_file4): Adjust for above


Patch by: Arwin Arni <arwin{_AT_}>

Reslove some deprecation warnings:

Make use of 'svn_uri_condense_targets' or 'svn_dirent_condense_targets'

instead of deprecated 'svn_path_condense_targets'.

* subversion/libsvn_client/log.c:

(svn_client_log5): Use 'svn_uri_condense_targets()' and


* subversion/svn/commit-cmd.c:

(svn_cl__commit): Use 'svn_dirent_condense_targets()'.

Patch by: Vijayaguru G <vijay{_AT_}>

Suggested by: kameshj

Noorul Islam K M <noorul{_AT_}>

doc typo fix.

* subversion/include/svn_error.h

(svn_error_purge_tracing): Remove extraneous 'is' from the docstring.

Clear a deprecation warning during "make".

* subversion/svnadmin/main.c

(subcommand_lslocks): svn_repos_fs_get_locks is deprecated, hence using the

new svn_repos_fs_get_locks2 with depth as infinity.

Patch by: Prabhu Gnana Sundar <>

Suggested by: me

Tweaked by: me

Removed a redundant member (added_with_history) from the file baton

and removed *relevent* unreachable code. A follow-up to r998193.

* subversion/libsvn_wc/update_editor.c

(struct file_baton): Removed 'added_with_history'.

(merge_file, close_file): Removed unreachable code.

Patch by: Arwin Arni <arwin{_AT_}>