* subversion/tests/cmdline/update_tests.py
  (update_moved_dir_file_add): Make this test expect current trunk code
   behavior. Instead of expecting an update to automatically add a new
   file to a locally moved subtree, expect a tree conflict to be flagged
   first, and expect 'svn resolve --accept=mine-conflict' to update the
   locally moved subtree, adding the new file there. Remove XFail marker
   since this test now passes.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433503 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/update_tests.py
  (update_moved_dir_leaf_del): Indentation fixes.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1433506 13f79535-47bb-0310-9956-ffa450edef68
Just return a boolean instead of an enum value from an internal api, as all
callers are interested in a single value only.

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

* subversion/libsvn_wc/update_editor.c
  (svn_wc__perform_file_merge): Change argument type.
  (merge_file): Update caller. Remove outdated comment.

* subversion/libsvn_wc/wc.h
  (svn_wc__perform_file_merge): Change argument type.


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