Follow-up to r28486, fix a bug when crawling the WC for trees with intersecting mergeinfo and contacting the server during a merge using ra_neon or ra_serf.
Follow-up to r28486, fix a bug when crawling the WC for trees with
intersecting mergeinfo and contacting the server during a merge using ra_neon
or ra_serf.

* subversion/libsvn_client/merge.c
  (get_mergeinfo_walk_cb): Handle the plethora of possible errors that
  svn_client__repos_locations() might throw our way depending on RA method
  used.

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