* subversion/libsvn_wc/node.c
  (convert_db_kind_to_node_kind): Use standard function.
  (svn_wc__node_get_pre_ng_status_data): Improve the 'svn status' information
    shown for the deletes of copies by handling the working-delete case
    where we didn't show some information.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1448353 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/cmdline/diff_tests.py
  (diff_two_working_copies): Remove XFail. Update expected result:
    a delete of a file, followed by an add of a directory with the
    same name produces two headers, not one.


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