Author: rhuijben
Date: Sun Jan 13 13:05:46 2013
New Revision: 1432604
URL: http://svn.apache.org/viewvc?rev=1432604&view=rev
Log:
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.
Modified:
subversion/trunk/subversion/svn/cl-conflicts.c
Modified: subversion/trunk/subversion/svn/cl-conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/cl-conflicts.c?rev=1432604&r1=1432603&r2=1432604&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/cl-conflicts.c (original)
+++ subversion/trunk/subversion/svn/cl-conflicts.c Sun Jan 13 13:05:46 2013
@@ -252,7 +252,11 @@ svn_cl__append_conflict_info_xml(svn_str
kind = svn_token__to_word(map_conflict_kind_xml, conflict->kind);
- apr_hash_set(att_hash, "kind", APR_HASH_KEY_STRING, kind);
+ apr_hash_set(att_hash, "type", APR_HASH_KEY_STRING, kind);
+
+ apr_hash_set(att_hash, "operation", APR_HASH_KEY_STRING,
+ svn_cl__operation_str_xml(conflict->operation, scratch_pool));
+
/* "<conflict>" */
svn_xml_make_open_tag_hash(&str, scratch_pool,
