Revision 1498873

Make svn_wc__serialize_conflict() and svn_wc__deserialize_conflict() use the
new conflict description structure (svn_wc_conflict_description3_t).

* subversion/libsvn_wc/entries.c
  (read_one_entry): Remove now unneeded conversion to old conflict description.
  (write_entry): Pass new conflict description svn_wc__deserialize_conflict().

* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__deserialize_conflict, svn_wc__serialize_conflict): Use new conflict
   description. As far as tree conflicts are concerned, both descriptions are
   still equivalent so this is not a functional change yet.

* subversion/libsvn_wc/tree_conflicts.h
  (svn_wc__deserialize_conflict, svn_wc__serialize_conflict): Update docstrings
   and declarations.

* subversion/libsvn_wc/upgrade.c
  (read_tree_conflicts, migrate_single_tree_conflict_data,
   svn_wc__upgrade_conflict_skel_from_raw): Update callers.

* subversion/tests/libsvn_wc/conflict-data-test.c
  (tree_conflict_data, test_deserialize_tree_conflict,
   test_serialize_tree_conflict_data): Update callers.