On the merge-sensitive-blame branch:
Include merged path information for 'svn blame -g --xml' and 'svn blame -gv'.

* subversion/include/svn_client.h
  (svn_client_blame_receiver2_t): Add the merged_path parameter; update
  docstring.
  (svn_client_blame_receiver_t): Update doc string.

* subversion/libsvn_client/blame.c
  (struct rev): Note that merge reporting uses the path member.
  (file_rev_handler): Set the path memeber of the revision.
  (svn_client_blame4): Send the path value to the receiver.
  (blame_wrapper_receiver): Update to the new interface.

* subversion/svn/blame-cmd.c
  (blame_receiver_xml):  Use the new interface, and include the path in the
  xml output.
  (print_line_info): Optionally print the merged path.
  (blame_receiver): Send the path to print_line_info().

* subversion/svn/schema/blame.rnc
  (merged): Add the path attribute.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/merge-sensitive-blame@866226 13f79535-47bb-0310-9956-ffa450edef68