* subversion/libsvn_wc/conflicts.c   (read_prop_conflicts): New helper to prepare for the times when new     conflict storage is enabled. Currently, this describes each property     conflict in a separate svn_wc_conflict_description2_t, within the     limitations of svn_wc_conflict_description2_t. These limitations     and suggested improvements have been recorded in comments.   (svn_wc__read_conflicts): Use the new read_prop_conflicts() helper    instead of creating just one conflict description.
* subversion/libsvn_wc/conflicts.c
  (read_prop_conflicts): New helper to prepare for the times when new
    conflict storage is enabled. Currently, this describes each property
    conflict in a separate svn_wc_conflict_description2_t, within the
    limitations of svn_wc_conflict_description2_t. These limitations
    and suggested improvements have been recorded in comments.
  (svn_wc__read_conflicts): Use the new read_prop_conflicts() helper
   instead of creating just one conflict description.


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

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