* subversion/tests/libsvn_wc/op-depth-test.c
  (move_parent_into_child): New XFail test for issue 4333.
  (test_funcs): Add test.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455097 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/libsvn_wc/op-depth-test.c
  (move_parent_into_child): Correct expectations, still XFail.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455105 13f79535-47bb-0310-9956-ffa450edef68
Fix issue 4333, parent moved into child.

* subversion/libsvn_wc/wc_db.c
  (delete_node): Consider nesting in relpath calculation.

* subversion/tests/libsvn_wc/op-depth-test.c
  (test_funcs): Mark move_parent_into_child PASS.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455108 13f79535-47bb-0310-9956-ffa450edef68
* CHANGES: List the new '--include-externals' option for
   'svn list' (issue #4225).

Patch by: Vijayaguru G <vijay{_AT_}collab.net>

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455142 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_client/merge.c
  (mark_dir_edited): Produce the right notify kind.

Found by: philip.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455163 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/libsvn_wc/op-depth-test.c
  (move_parent_into_child): Extend to test another move.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455164 13f79535-47bb-0310-9956-ffa450edef68
Followup to r1449023 (which removed GSSAPI from configure), remove the
remnants of GSSAPI.

* aclocal.m4: Remove include.

* Makefile.in: Remove variable.

* build.conf:
  (gssapi): Remove section. 
  (libsvn_ra_serf): Adjust link.

* svn_error_codes.h
  (SVN_ERR_RA_SERF_GSSAPI_INITIALISATION_FAILED): Deprecate.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455183 13f79535-47bb-0310-9956-ffa450edef68
Apply some query tweaks to make sure the upcoming Sqlite 3.7.16 uses the
right index in these queries, where the view behavior is not strictly defined.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_CACHE_TARGET_PROPS,
   STMT_CACHE_TARGET_PRISTINE_PROPS): Avoid using the NODES_CURRENT view in
     this query as the sqlite optimizer can't always look through views.
     Add an (ignored because this query follows the primary key) order by
     to add another hint to the optimizer to use the right index on NODES.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455239 13f79535-47bb-0310-9956-ffa450edef68
* CHANGES: Mention inheritable props and new svn:auto-props and
  svn:global-ignores reserved properties.



git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455275 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/wc_db_update_move.c
  (tc_editor_add_directory): Correct a svn_kind_t/svn_node_kind_t mismatch.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455349 13f79535-47bb-0310-9956-ffa450edef68
Improve the logic in mod_dav_svn's implementation of LOCK.

* subversion/mod_dav_svn/lock.c
  (append_locks): Only allow locks on paths that are in the repository,
    disallow anonymous locks earlier, move the repos variable to function
    scope and cleanup some messy uses of resource->info->repos.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455352 13f79535-47bb-0310-9956-ffa450edef68
Check that the pointer to the string is not NULL for svn_utf__*_is_valid().

* subversion/libsvn_subr/utf_validate.c
  (svn_utf__cstring_is_valid, svn_utf__is_valid): Check data input before
    using it.  If it's NULL then return FALSE because it's not a valid
    string.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455375 13f79535-47bb-0310-9956-ffa450edef68
Merge svn_kind_t into svn_node_kind_t, leaving only one public enumeration
that describes node kinds.

* subversion/include/svn_types.h (svn_kind_t): Removed.
   All uses of svn_kind_t were replaced with svn_node_kind_t.
  (svn_node_kind_t): New enumeration constant, svn_node_symlink.
   Replaces all previous uses of svn_kind_symlink.
  (svn__node_kind_from_kind): Removed. All call sites updated.
  (svn__kind_from_node_kind): Removed. All call sites updated.

* subversion/libsvn_wc/tree_conflicts.c (node_kind_map):
   Added comment about incompatible representation of svn_node_unknown.

* subversion/libsvn_wc/node.c (convert_db_kind_to_node_kind):
   May be redundant, and comment is out of date. Added a note about that.

There are also a zillion changes in dependent files, and they all result
from the following renames:

     svn_kind_t       to svn_node_kind_t
     svn_kind_none    to svn_node_none
     svn_kind_file    to svn_node_file
     svn_kind_dir     to svn_node_dir
     svn_kind_unknown to svn_node_unknown
     svn_kind_symlink to svn_node_symlink


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455559 13f79535-47bb-0310-9956-ffa450edef68
Working on isue #4326 (update javahl with new 1.8 APIs).

* bindings/javahl/src/org/apache/subversion/javahl/types/NodeKind.java
  (NodeKind.symlink): New enumeration constant.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455562 13f79535-47bb-0310-9956-ffa450edef68
Working on isue #4326 (update javahl with new 1.8 APIs).
Update ISVNCLient.add to expose the no_autoprops option.

[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* ISVNClient.java (ISVNClient.add): Add new overload for this method
   with noAutoProps parameter. Update docstring on old version.
* SVNClient.java (SVNClient.add): Native method grows the noAutoProps parameter.
   Implement the old interface as a wrapper around the new interface.

[in subversion/bindings/javahl/native]
* SVNClient.h (SVNClient.add): Add no_autoprops parameter to prototype.
* SVNClient.cpp (SVNCLient.add): Update implementation and call
   svn_client_add5 instead of svn_client_add4.
* org_apache_subversion_javahl_SVNClient.cpp
  (Java_org_apache_subversion_javahl_SVNClient_add): Update native wrapper.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455589 13f79535-47bb-0310-9956-ffa450edef68
Update JavaHL to support the 1.8 metadataOnly flag to move.

[In subversion/bindings/javahl]

* native/SVNClient.h
* native/SVNClient.cpp
  (SVNClient::move): Add metadataOnly parameter.

* native/org_apache_subversion_javahl_SVNClient.cpp
  (Java_org_apache_subversion_javahl_SVNClient_move): Add metadataOnly
   parameter.

* src/org/apache/subversion/javahl/ISVNClient.java
  (ISVNClient.move): Add metadataOnly parameter.

* src/org/apache/subversion/javahl/SVNClient.java
  (SVNClient.move): Add metadataOnly parameter.

* src/org/tigris/subversion/javahl/SVNClient.java
  (SVNClient.move): Pass false for metadataOnly.

* tests/org/apache/subversion/javahl/BasicTests.java
  (BasicTests.testMove, BasicTests.testTreeConflict): Pass false for
   metadataOnly.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455612 13f79535-47bb-0310-9956-ffa450edef68
Working on isue #4326 (update javahl with new 1.8 APIs).
Add the no_autoprops option to SVNClient.doImport.

[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* ISVNClient.java (ISVNClient.doImport): Add the noAutoProps parameter
   to the 1.8 overload of this method, and add a docstring.
  Update the docstring of the older overload.
* SVNClient.java (SVNClient.doImport): Update the older overloaded
   wrapper for the native method, update the native method declaration.
* callback/ImportFilterCallback.java (ImportFilterCallback):
   Note in the docstring that this class is new in 1.8.

[in subversion/bindings/javahl/native]
* SVNClient.h, SVNCient.cpp (SVNClient.doImport): Add noAutoProps parameter.
* org_apache_subversion_javahl_SVNClient.cpp
  (Java_org_apache_subversion_javahl_SVNClient_doImport): Update native method.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455638 13f79535-47bb-0310-9956-ffa450edef68
Working on isue #4326 (update javahl with new 1.8 APIs).

* subversion/bindings/javahl/native/SVNClient.cpp (SVNClient::commit):
   Call svn_client_commit6 (with externals drilldown enabled) instead
   of svn_client_commit5.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455645 13f79535-47bb-0310-9956-ffa450edef68
* subversion/include/svn_client.h (svn_client_list2): Fix typo in docstring.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455647 13f79535-47bb-0310-9956-ffa450edef68
* subversion/svn/svn.c
  (svn_cl__cmd_table): Replace a lost full-stop in the help text for merge.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1455674 13f79535-47bb-0310-9956-ffa450edef68