First commit of breaking apart the merge_props_changed() function in the libsvn_client merge code. This will allow providing the text and property merge information to libsvn_wc in a single call, for atomic behavior and for introducing conflicts in a single location. (This will remove the need to combine multiple conflicts on a single node)
First commit of breaking apart the merge_props_changed() function in the
libsvn_client merge code. This will allow providing the text and property
merge information to libsvn_wc in a single call, for atomic behavior and
for introducing conflicts in a single location.
(This will remove the need to combine multiple conflicts on a single node)

* subversion/libsvn_client/merge.c
  (merge_props_changed): Break apart into...
  (prepare_merge_props_changed): ... this and the old function itself.
  (merge_dir_props_changed,
   merge_file_changed): Update callers.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion