On the tree-conflicts-notify branch: Bug fixes before we merge to
trunk.  Mainly changes to test code.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Eliminate false tree conflict upon checking
   out a file external.

* subversion/tests/cmdline/tree_conflict_tests.py 
  (ensure_tree_conflict): The commit target should be the tree conflict
   victim, not its parent directory.

* subversion/tests/cmdline/stat_tests.py
  (status_with_tree_conflicts): Adjust expectations (incoming delete
   is not applied to a tree conflict victim).

* subversion/tests/cmdline/merge_tests.py
  (del_differing_file): For now, allow tree conflicts to be reported
   as text conflicts in the output summary.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/tree-conflicts-notify@874000 13f79535-47bb-0310-9956-ffa450edef68
4 files changed