Merged revisions 22322-23006 via svnmerge from
http://svn.collab.net/repos/svn/trunk to incomplete-directories branch.
This breaks the branch, because it leaves 7 files conflicted:
subversion/include/svn_wc.h
subversion/libsvn_wc/entries.c
subversion/libsvn_wc/README
subversion/libsvn_ra_local/ra_plugin.c
subversion/libsvn_repos/reporter.c
subversion/svn/commit-cmd.c
subversion/svn/import-cmd.c
Although I believe the resolution will be trivial, I'd like it to be a
versioned event, just in case. It is committed separately as r23010.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/incomplete-directories@863083 13f79535-47bb-0310-9956-ffa450edef68
