Following up on r1432470, tweak xml output a bit.* subversion/svn/cl-conflicts.c (svn_cl__append_conflict_info_xml): Use argument name 'type' to avoid confusion with the 'kind' argument for tree conflicts. Add the operation.
Following up on r1432454, make 'svn info' print more of the conflictinformation that is now available, instead of still just printingwhat we originally stored for conflicts in svn_wc_entry_t.info.rnc needs updating after this patch. I expected to copy and pastethe missing pieces (src-left, etc.) from the tree conflicts, but thesearen't defined yet, while introduced in 1.6.* subversion/svn/cl-conflicts.c Renamed from tree-conflicts.c (map_conflict_kind_xml): New map. (svn_cl__append_tree_conflict_info_xml): Rename to... (append_tree_conflict_info_xml): ... this and make static. (svn_cl__append_conflict_info_xml): New function that handles all conflict kinds.* subversion/svn/cl-conflicts.h Renamed from tree-conflicts.h (svn_cl__append_tree_conflict_info_xml): Rename to... (svn_cl__append_conflict_info_xml): ... this. Update docstring.* subversion/svn/conflict-callbacks.c (includes): Updated for rename.* subversion/svn/info-cmd.c (includes): Follow rename. (print_info_xml): Delegate all conflict work to svn_cl__append_conflict_info_xml. (print_info): Print left and right version for the first conflict, instead of just for tree conflicts.* subversion/svn/status.c (includes): Updated for rename.* subversion/svn/tree-conflicts.c Renamed to cl-conflicts.c* subversion/svn/tree-conflicts.h Renamed to cl-conflicts.h