Create '1.9.x-crop-safety' branch based of the '1.9.x-update-tc-detection'
branch.

This branch makes 'svn --set-depth X' keep your local changes, if there
were any in X. Before this it would keep them if 'X' was modified, but
not if only a descendant was.

* subversion/libsvn_wc/crop.c (1491756,1661580,1661585,1661589,1661591,1661682)
  (crop_children): Rename pool. Walk only BASE children. Only delete
    if the only change in the tree is a delete. Otherwise recurse
    on children with depth empty. Use svn_wc__db_base_remove() as
    we don't want to touch WORKING.
  (svn_wc_exclude): Check tree for changes before marking it excluded.
    Crop children if not allowed. Use svn_wc__db_base_remove() as
    we don't want to touch WORKING.

* subversion/libsvn_wc/externals.c
  (svn_wc__external_remove): Update caller. (r1661580)

* subversion/libsvn_wc/update_editor.c
  (delete_entry): Update caller *3. (r1661580)
  (close_edit): Update caller. (r1661580)

* subversion/libsvn_wc/wc-queries.sql
  (STMT_UPDATE_NODE_BASE_DEPTH): Verify presence. (r1661585)

* subversion/libsvn_wc/wc_db.c
  (db_base_remove): Remove unneeded remove_locks. Allow adding excluded.
      (r1661580,1661584,1661591)
  (svn_wc__db_base_remove): Allow adding excluded. Update caller.(r1661580)

  (bump_node_revision): Use the only bit of code needed from db_base_remove
     directly. (r1661580,1661584)

  (process_committed_leaf): Move a tiny bit of code from db_base_remove here
     until it is completely removed by the 1.9.x-commit-fixes branch.
     Update caller. (r1661580, and tweaks)

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_base_remove): Update arguments. Update docs. (r1661580)

* subversion/libsvn_wc/workqueue.c
  (run_base_remove): Update caller. (r1661580)

* subversion/tests/cmdline/depth_tests.py (r1661585)
  (fold_tree_with_unversioned_modified_items): Update expected results.

* subversion/tests/libsvn_wc/op-depth-test.c
  (base_dir_insert_remove): Update caller. (r1661580)


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.9.x-crop-safety@1661983 13f79535-47bb-0310-9956-ffa450edef68
9 files changed