Fix a bug whereby a property conflict description always reported 'unknown' for the node kind.  This was a regression from 1.7.  This was not visible from the command-line client.
Fix a bug whereby a property conflict description always reported 'unknown'
for the node kind.  This was a regression from 1.7.  This was not visible
from the command-line client.

* subversion/libsvn_wc/conflicts.c
  (read_prop_conflict_descs): Take the node kind as a parameter and use it
    it instead of setting the field to 'unknown'.
  (svn_wc__read_conflicts): Pass the node kind for a property conflict, when
    possible.


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1477876 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion