madanus in subversion

On the incomplete-directories branch: Fix default depth for the info command.

* subversion/svn/info-cmd.c

(svn_cl__info): The default depth for the info command is one, and not

infinity as r21829 thought.

Approved by: jerenkrantz

On the incomplete directories branch. Fix getopt_tests 7.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Modify the help-text of the -N switch to match the expected value.

Add help-text for the --depth parameter.

Approved by: jerenkrantz

On the incomplete-directories branch. Fix the default depth for the ls command.

* subversion/svn/list-cmd.c

(svn_cl__list): The default depth for the ls command is one, and not

infinity as r21829 thought.

Approved by: jerenkrantz

Under the incomplete-directories branch. Simple fix in README.branch

under the 'obvious fix' rule.

* README.branch

(Examples): Correct slip. When checking out with 'depth-files',

the entries file will contain the this_dir with 'depth-files' - obviously.

Update README.branch with thoughts on how incomplete directories would affect

the status and info commands.

* README.branch

(User Interface): Add status and info to the list of affected commands, and

explain how they could be handled.

Approved By: epg

Fix doc to reflect actual function parameter, as per the obvious fix rule.

* subversion/include/svn_ra.h

(svn_ra_get_merge_info): Change mergeinfo to mergeoutput.

Fix typo in 'S:include_parents'. Must be 'S:include-parents'.

Approved by: dlr, dberlin

On the merge-tracking branch:

* subversion/libsvn_ra_dav/mergeinfo.c

(svn_ra_dav__get_merge_info): Modify to use the 'S:include-parents'

tag as used by dav_svn__get_merge_info_report().

Follow-up for r18146, correcting error handling.

* subversion/libsvn_repos/hooks.c

(run_hook_cmd): Actually capture the return value of

apr_file_inherit_unset() before testing for error.

Approved by: rooneg


A follow-up to r20316.

Found by: Peter Samuelson <>

* www/faq.html: Fix typo.

Rename the python bindings test case classes appropriately.

Patch by: me

Approved by: djames

* subversion/bindings/swig/python/tests/

(SubversionRepositoryTestCase): Renamed to SubversionWorkingCopyTestCase.

(suite): Pass SubversionWorkingCopyTestCase to unittest.makeSuite().

* subversion/bindings/swig/python/tests/

(SubversionRepositoryTestCase): Renamed to


(suite): Pass SubversionRepositoryAccessTestCase to unittest.makeSuite().

Revert back part of r20005.

* doc/README

(user/): Revert back to original wording as per dlr's advice.

Remove reference to the `design' directory and simplify

a sentence in doc/README.

Approved By: rooneg

* doc/README

(design/): Remove section.

(user/): Simplify sentence.

Fix verbose message for `avail --blocked'.

Review by: djames

* contrib/client-side/

(action_avail): Modified to display an appropriate message, when

`svnmerge avail --blocked -v' is invoked.


(madanus): Add myself as partial committer for svnmerge.