Checkout Tools
  • last updated 2 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
On the issue-2843-dev branch:

Update for APIs and deprecations made since this branch was created.

* subversion/libsvn_client/update.c

(svn_client__update_internal): Call svn_wc_adm_close2.

* subversion/libsvn_wc/adm_crawler.c: Remove a big stretch of code

that now lives in deprecated.c. Wonder, and maybe worry, about

why the recent merges didn't take care of this automatically.

  1. … 1 more file in changeset.
On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34008):

svn merge https://svn.collab.net/repos/svn/trunk

There were four conflicts. I am committing them with conflict markers

intact, 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

  1. … 366 more files in changeset.
On the issue-2843-dev branch: bring almost-up-to-date with trunk.

I ran:

svn merge https://svn.collab.net/repos/svn/trunk@r33535

This was when latest trunk was actually r33554. But due to r33536,

attempts to merge the very latest trunk would end early with this

error:

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 response

So I'm working around it by taking this one step at a time. The first

step is this merge, which brings us up to r33535. I've also left two

files conflicted, so that the conflict resolution can be a separate

commit 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 resolution

probably so, but I want it to be a separate commit just in case.)

  1. … 532 more files in changeset.
On the issue-2843-dev branch.

Merged from trunk r31940:r32487.

  1. … 243 more files in changeset.
On the issue-2843-dev branch.

Merged from trunk r31359:r31939 to catch up.

  1. … 444 more files in changeset.
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 the

server 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.

  1. … 5 more files in changeset.
On the issue-2843-dev branch:

Handle svn_depth_exclude in the cropping logic. However, other parts of the

libsvn_wc code still don't honor the svn_depth_exclude flag.

* subversion/libsvn_wc/entries.c

(write_entry): Store svn_depth_exclude for subdir entries.

* subversion/libsvn_wc/README

(depth): Document the change in entries.c.

* subversion/libsvn_wc/lock.c

(do_open): Skip entry with svn_depth_exclude depth.

* subversion/libsvn_wc/adm_ops.c

(svn_wc_remove_from_revision): Skip excluded subdir entries and preserve

excluded entry in parent dir.

* subversion/libsvn_wc/crop.c

(svn_wc_crop_tree): Handle svn_depth_exclude properly, mark target as

svn_depth_exclude if the parent expects it.

(crop_children): Same. Also fold the notify branches.

* subversion/libsvn_client/update.c

(svn_client__update_internal): Skip update totally on svn_depth_exclude.

  1. … 5 more files in changeset.
On the issue-2843-dev branch:

Generate notifications in the cropping logic. And actually invoke the cropping

logic in the update logic. Preliminary debug has made the cropping logic work

to some degree. However, many tests fail unexpectedly. Further debugging is

needed.

* subversion/libsvn_wc/crop.c

(svn_wc_crop_tree, crop_children): Generate notifications. Some adm_access

related tunning to make it work. And some other bugs fixed.

* subversion/libsvn_client/update.c

(svn_client__update_internal): Lock enough depth and call

svn_wc_crop_tree().

  1. … 1 more file in changeset.