On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34008): svn merge https://svn.collab.net/repos/svn/trunkThere were four conflicts. I am committing them with conflict markersintact, so they can be resolved in a separate revision: subversion/libsvn_wc/update_editor.c subversion/libsvn_wc/lock.c subversion/libsvn_wc/adm_crawler.c subversion/libsvn_client/ra.c
On the issue-2843-dev branch: bring almost-up-to-date with trunk.I ran: svn merge https://svn.collab.net/repos/svn/trunk@r33535This was when latest trunk was actually r33554. But due to r33536,attempts to merge the very latest trunk would end early with thiserror: subversion/libsvn_ra_neon/util.c:545: (apr_err=160013) svn: '/repos/svn/!svn/bc/33554/branches/issue-2843-dev/tools/\ buildbot/slaves/win32-xp-VS2005' path not found subversion/libsvn_ra_neon/util.c:1243: (apr_err=175002) svn: Error reading spooled REPORT request responseSo I'm working around it by taking this one step at a time. The firststep is this merge, which brings us up to r33535. I've also left twofiles conflicted, so that the conflict resolution can be a separatecommit immediately following this one. They are: subversion/libsvn_wc/update_editor.c subversion/libsvn_wc/README(The README resolution is trivial, and the update_editor.c resolutionprobably so, but I want it to be a separate commit just in case.)
On the issue-2843-dev branch.This commit solves on problem exposed by the new test case in r31764.We cannot report excluded branch to server when depth_is_sticky, otherwise theserver will not send contents of that path and we will be in trouble.Moreover, we have to report delete_path() on it(when !report_everything),to ensure that the server will send us full content.* subversion/include/svn_wc.h, subversion/libsvn_wc/adm_crawler.c (svn_wc_crawl_revision4): New API, with new parameter honor_depth_exclude. (svn_wc_crawl_revision3): Deprecated. * subversion/libsvn_client/switch.c (svn_client__switch_internal):* subversion/libsvn_client/status.c (svn_client_status3):* subversion/libsvn_client/diff.c (diff_repos_wc):* subversion/libsvn_client/update.c (svn_client__update_internal): Adjust all callers of the deprecated API.