subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1693570 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/resolved.c
Date Fri, 31 Jul 2015 11:31:34 GMT
Author: stsp
Date: Fri Jul 31 11:31:33 2015
New Revision: 1693570

URL: http://svn.apache.org/r1693570
Log:
Provide an API that returns the resolution option ID of a resolved conflict.
This also allows callers to check if a conflict has been resolved already.

* subversion/include/svn_client.h
  (svn_client_conflict_get_resolution): Declare.

* subversion/libsvn_client/resolved.c
  (svn_client_conflict_get_resolution): Implement.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/resolved.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1693570&r1=1693569&r2=1693570&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Fri Jul 31 11:31:33 2015
@@ -4651,6 +4651,16 @@ svn_client_conflict_get_incoming_new_rep
   apr_pool_t *scratch_pool);
 
 /**
+ * Return the ID of the option this conflict has been resolved to.
+ * If the conflict has not been resolved yet, then return
+ * @c svn_client_conflict_option_undefined.
+ *
+ * @since New in 1.10.
+ */
+svn_client_conflict_option_id_t
+svn_client_conflict_get_resolution(const svn_client_conflict_t *conflict);
+
+/**
  * Return the node kind of the tree conflict victim described by @a conflict.
  * The victim is the local node in the working copy which was affected by the
  * tree conflict at the time the conflict was raised.

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1693570&r1=1693569&r2=1693570&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Fri Jul 31 11:31:33 2015
@@ -953,6 +953,12 @@ svn_client_conflict_get_incoming_new_rep
   return SVN_NO_ERROR;
 }
 
+svn_client_conflict_option_id_t
+svn_client_conflict_get_resolution(const svn_client_conflict_t *conflict)
+{
+  return conflict->resolution;
+}
+
 svn_node_kind_t
 svn_client_conflict_tree_get_victim_node_kind(
   const svn_client_conflict_t *conflict)



Mime
View raw message