Raise tree-conflicts for finite depth move-updates that don't
modify but only bump the move source.  At present these conflicts
can only be resolved to 'working' thus breaking the move.

* subversion/libsvn_wc/wc_db_private.h
  (svn_wc__db_bump_moved_away): Add db parameter.

* subversion/libsvn_wc/wc_db.c
  (bump_revisions_post_update): Pass db.

* subversion/libsvn_wc/wc_db_update_move.c
  (mark_tree_conflict): Add comment.
  (svn_wc__db_read_conflict_internal): Trace error.
  (depth_sufficient_to_bump, bump_mark_tree_conflict): New.
  (bump_moved_away): Add depth and db parameters, raise conflict.
  (svn_wc__db_bump_moved_away): Add db parameter, raise conflict.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_MOVED_PAIR3): Select kind.
  (STMT_SELECT_HAS_NON_FILE_CHILDREN): New.
  (STMT_SELECT_HAS_GRANDCHILDREN): New.

* subversion/tests/libsvn_wc/op-depth-test.c
  (finite_move_update_bump): New test.
  (test_funcs): Add new test.

* subversion/tests/libsvn_wc/utils.h
  (sbox_wc_update_depth): New.

* subversion/tests/libsvn_wc/utils.c
  (sbox_wc_update): Make into a wrapper calling ...
  (sbox_wc_update_depth): ... this, don't set sticky flag.


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