svn commit: r1727702 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/resolved.c

[st...@apache.org]

Author: stsp
Date: Sat Jan 30 14:32:28 2016
New Revision: 1727702

URL: http://svn.apache.org/viewvc?rev=1727702&view=rev
Log:
*subversion/libsvn_client/resolved.c
 (svn_client_conflict_prop_get_resolution): Return 'unspecified' rather than
  'undefined' for property conflicts which haven't been resolved yet.

*subversion/include/svn_client.h
 (svn_client_conflict_prop_get_resolution): Update docstring accordingly.

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=1727702&r1=1727701&r2=1727702&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Sat Jan 30 14:32:28 2016
@@ -4819,7 +4819,7 @@ svn_client_conflict_prop_resolve_by_id(
  * Return the ID of the option this property @a conflict in property
  * @a propname has been resolved to.
  * If the conflict has not been resolved yet, then return
- * @c svn_client_conflict_option_undefined.
+ * @c svn_client_conflict_option_unspecified.
  *
  * @since New in 1.10.
  */

Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1727702&r1=1727701&r2=1727702&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Sat Jan 30 14:32:28 2016
@@ -1206,7 +1206,7 @@ svn_client_conflict_prop_get_resolution(
 
   option = svn_hash_gets(conflict->resolved_props, propname);
   if (option == NULL)
-    return svn_client_conflict_option_undefined;
+    return svn_client_conflict_option_unspecified;
 
   return svn_client_conflict_option_get_id(option);
 }