ra_serf: Simplify merge report parsing by using ra_serf's common XML helpers.
ra_serf: Simplify merge report parsing by using ra_serf's common XML helpers.

* subversion/libsvn_ra_serf/merge.c
  (merge_state_e): Add NONE value.
  (resource_type_e): Rename NONE to UNSET.
  (merge_state_list_t): Remove.
  (svn_ra_serf__merge_context_t): Remove ->ns_list, ->state and ->free_state.
  (push_state): Call svn_ra_serf__xml_push_state.
  (pop_state): Remove.
  (start_merge, end_merge, cdata_merge): Adjust for altered state mechanics;
  use temporary pools where possible.


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

wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion