Checkout Tools
  • last updated 4 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34097):

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

There was one conflict. I am committing it with conflict markers

intact, to be resolved in a separate revision:

subversion/libsvn_wc/entries.c

  1. … 87 more files 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:

* subversion/include/svn_wc.h

(svn_wc_crawl_revisions4): Clarify what honor_depth_exclude flag does,

using firemeteor's example. This follows up to r31765.

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 issue-2843-dev branch:

Make 'svn update' honor the svn_depth_exclude flag. It works for clean wc

now. And all existing test suites remained working. However, the crawler has

not been updated yet. So filtering modification in the excluded branch will

not work now.

The svn_wc_entry() and svn_wc_entries_read() now filter out excluded item when

show_hidden is FALSE.

* subversion/include/svn_wc.h

(svn_wc_entry, svn_wc_entries_read, svn_wc_walk_entries3): Document the

new filter behavior.

* subversion/libsvn_wc/adm_ops.c

(tweak_entries, svn_wc__do_update_cleanup): Properly tweak excluded entry.

* subversion/libsvn_wc/ambient_depth_filter_editor.c

(make_dir_baton): Update the filter logic.

* subversion/libsvn_wc/crop.c

(svn_wc_crop_tree): Remove the defensive check against excluded target.

* subversion/libsvn_wc/entries.c

(read_entries):

* subversion/libsvn_wc/lock.c

(prune_deleted): Update behavior to take svn_depth_exclude into account.

* subversion/libsvn_wc/update_editor.c

(complete_directory): Clear the exclude flag properly when needed.

* subversion/svn/main.c

(main): Accept value 'exclude' for the --set-depth option.

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

* subversion/include/svn_wc.h

(svn_wc_crop_tree): Documentation tweaks.

* subversion/libsvn_wc/crop.c

(svn_wc_crop_tree): Comment and formatting tweaks.

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

Initial implementation of the cropping logic.

No notification is generated yet.

* subversion/libsvn_wc/crop.c: New file.

(svn_wc_crop_tree): New public function.

(crop_children): New internal helper.

* subversion/include/svn_wc.h

(svn_wc_crop_tree): New function.

  1. … 1 more file in changeset.