issue-2843-dev

Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Deleting the issue-2843-dev branch, it was merged back to trunk in r34108.
Do a --record-only merge of -r31357:34104 from trunk so this branch will

reintegrate back to trunk cleanly.

On the issue-2843-dev branch: bring up-to-date with latest trunk (r34104).

On the issue-2843-dev branch:

* subversion/tests/cmdline/depth_tests.py

(test_list): Expect excluded_receive_remote_removal to pass now.

On the issue-2843-dev branch: bring up-to-date with latest trunk (r34101).

On the issue-2843-dev branch: resolve conflicts from the r34098 merge.

* subversion/libsvn_wc/entries.c

(read_entries): Resolve conflict between r31713 and r34093.

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. … 73 more files in changeset.
On the issue-2843-dev branch: bring up-to-date with trunk@r34014.

On the issue-2843-dev branch:

* subversion/libsvn_wc/crop.c

(crop_children): Add static keyword.

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.

On the issue-2843-dev branch: resolve conflicts from the r34009 merge.

* subversion/libsvn_wc/update_editor.c

(do_entry_deletion): Adjust for check_tree_conflict's new parameters.

* subversion/libsvn_wc/lock.c

(do_open): Adjust for r33676.

* subversion/libsvn_client/ra.c

(svn_client_uuid_from_path): Adjust for r33775.

* subversion/libsvn_wc/adm_crawler.c

(svn_wc_crawl_revisions4): Resolve non-conflict.

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

    • ?
    ./subversion/bindings/javahl/native/Notify2.cpp
    • ?
    ./subversion/bindings/swig/include/svn_global.swg
  1. … 352 more files in changeset.
On the issue-2843-dev branch: bring up-to-date with trunk@r33536:

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

    • ?
    ./tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat
    • ?
    ./tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat
    • ?
    ./tools/buildbot/slaves/win32-xp-VS2005/config.bat
  1. … 8 more files in changeset.
On the issue-2843-dev branch:

* subversion/libsvn_wc/update_editor.c

(do_entry_deletion): Resolve conflict of r33560.

* subversion/libsvn_wc/README: Same.

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

    • ?
    ./subversion/libsvn_subr/properties.c
    • ?
    ./subversion/mod_dav_svn/reports/update.c
    • ?
    ./subversion/mod_dav_svn/deadprops.c
  1. … 518 more files in changeset.
On the issue-2843-dev branch:

* subversion/libsvn_wc/update_editor.c

(complete_directory): Follow up to r32265 with a comment clarification.

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.

On the issue-2843-dev branch.

Merged from trunk r31940:r32487.

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

Improves the sanity check against copy destination. This covers the situation

of copy into hidden items (excluded, absent etc.)

* subversion/libsvn_wc/copy.c

(copy_added_dir_administratively): Settle a TODO item.

(svn_wc_copy2): Sanity check to capture missing/hidden destination.

* subversion/libsvn_client/copy.c

(repos_to_wc_copy): Similar sanity check.

On the issue-2843-dev branch.

Receive remote removal on excluded items.

* subversion/libsvn_wc/update_editor.c

(do_entry_deletion): Handles deletion of excluded items.

(complete_directory): Correct the check of removed target. And don't need to

clear exclude flag before call to do_entry_deletion() anymore.

* subversion/libsvn_wc/adm_crawler.c

(report_revisions_and_depths): Report revision of the parent directory

instead of SVN_INVALID_REVNUM for excluded path.

* subversion/libsvn_repos/reporter.c

(delta_dirs): Drive the editor upon deletion of excluded path.

On the issue-2843-dev branch.

* subversion/libsvn_client/switch.c

(svn_client__switch_internal): Handles cropping during switch.

On the issue-2843-dev branch.

* subversion/tests/cmdline/depth_tests.py

(excluded_receive_remote_removal): Correct the test behavior. Tuned the

formation.

(test_list): Replace tab with spaces.

On the issue-2843-dev branch.

* subversion/libsvn_wc/crop.c

(svn_wc_crop_tree): Explicitly prohibit excluding switched path.

(crop_children): Move a TODO item to svn_wc_crop_tree().

* subversion/libsvn_wc/adm_crawler.c

(report_revisions_and_depths): Add a comment about excluding switched

path being prohibited.

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.

On the issue-2843-dev branch.

* subversion/libsvn_wc/update_editor.c

(complete_directory): Use the full target path when retrieving adm_access.

On the issue-2843-dev branch.

Fix a problem when trying to pull in an excluded target while it is actually

gone in the repos.

* subversion/libsvn_wc/update_editor.c

(do_entry_deletion): Add declaration.

(complete_directory): Remove the target if it is both excluded locally and

removed in repos.

On the issue-2843-dev branch.

Introduce a new test case to demonstrate an expected behavior inspired by

Karl: 'svn update' should receive the removal of an exclude path in the

repository and properly clear the local exclude flag. This need cooperation

between the server and the client and thus will not work now.

* subversion/tests/cmdline/depth_tests.py

(excluded_receive_remote_removal): New test.

(test_list): Add the new test as XFail().

Follow up to r32052 with some code and comment clarifications.

* subversion/libsvn_wc/crop.c

(svn_wc_crop_tree): Declare and initialize entry_in_repos in one

place, and tweak the comment describing what it is for. Fix

formatting of another comment.

On the issue-2843-dev branch.

* subversion/tests/cmdline/depth_tests.py

(excluded_path_update_operation): Renamed from excluded_path_operation.

And...

(excluded_path_misc_operation): ...extract some tests from the above one

into this test suite. More tests are added too.

(test_list): Update accordingly. And excluded_path_update_operation is no

longer XFail().