Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.

* subversion/libsvn_client/commit_util.c

(do_item_commit): Recheck and confirm the modification to show_hidden flag.

Tune the comment and settle the TODO item.

On the issue-2843-dev branch.

Turn off some suspicious show_hidden flags to svn_wc_entry() call.

* subversion/libsvn_wc/props.c

(svn_wc__working_props_committed,

svn_wc__loggy_revert_props_create,

svn_wc__loggy_revert_props_restore): Turn off the flag, but leave the TODO

entry for later recheck.

* subversion/libsvn_client/commit_util.c

(do_item_commit): The same as above.

* subversion/libsvn_wc/log.c

(log_do_committed): Turn off the flag.

* subversion/libsvn_client/merge.c

(check_scheme_match): The same as above.

  1. … 3 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.

Checking the show_hidden parameters in entry API calls. Tag some suspicious

show_hidden = TRUE call with TODOs, for further check.

* subversion/libsvn_wc/props.c

(svn_wc__working_props_committed, svn_wc__loggy_revert_props_create,

svn_wc__loggy_revert_props_restore): Tag a suspicious show_hidden as TODO.

* subversion/libsvn_wc/crop.c

(svn_wc_crop_tree): Add an TODO item for switched target.

* subversion/libsvn_wc/log.c

(remove_deleted_entry): Confirm with a comment.

(log_do_committed): Tag a suspicious show_hidden as TODO.

* subversion/libsvn_wc/adm_ops.c

(process_committed_internal): Recheck and finish an TODO. Update the

comment.

(revert_entry): Confirm with a comment.

* subversion/libsvn_client/merge.c

(check_scheme_match): Tag a suspicious show_hidden as TODO.

* subversion/libsvn_client/ra.c

(svn_client_uuid_from_path): Confirm with a comment.

* subversion/libsvn_client/commit_util.c

(do_item_commit): Tag a suspicious show_hidden as TODO.

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

Check those calls to svn_wc_entry(), svn_wc_entries_read() and

svn_wc_walk_entries3() with show_hidden set to TRUE. The caller should be

prepared to handle excluded items. This only covers part of the potential

modification positions.

* subversion/libsvn_wc/relocate.c

(svn_wc_reloacate3):

* subversion/libsvn_wc/crop.c

(svn_wc_crop_tree):

* subversion/libsvn_wc/props.c

(svn_wc_prop_list, svn_wc_prop_get, modified_props):

* subversion/libsvn_wc/entries.c

(svn_wc_walk_entries3):

* subversion/libsvn_wc/copy.c

(copy_added_dir_administratively):

* subversion/libsvn_wc/adm_ops.c

(process_committed_internal, svn_wc_delete3, revert_entry):

* subversion/libsvn_client/merge.c

(get_mergeinfo_walk_cb):

* subversion/libsvn_client/commit_util.c

(harvest_committables): Handles svn_depth_exclude or Add TODO for later

checking.

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

Merged from trunk r31359:r31939 to catch up.

  1. … 444 more files in changeset.