| Log Message: |
Introduce a new conflict API function: svn_client_conflict_prop_get_propvals()
Make use of this function in the conflict resolver. The biggest change is that
the resolver now has to deal with property values in terms of svn_string_t
rather than paths to temporary files.
Until the svn_wc_conflict_description2_t structure is fully phased out,
however, the client library must still read temporary files into svn_string_t
behind the scenes, and the resolver must still return merged property values
via temporary files.
* subversion/include/svn_client.h
(svn_client_conflict_prop_get_propvals): Declare.
* subversion/libsvn_client/resolved.c
(get_propval_from_filepath): New helper function.
(svn_client_conflict_prop_get_propvals): Implement.
* subversion/svn/conflict-callbacks.c
(merge_prop_conflict, show_prop_conflict, edit_prop_conflict,
handle_prop_conflict): Handle all property values as svn_string_t.
|
subversion/trunk/subversion/include/svn_client.h