You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2016/02/16 15:46:18 UTC

svn commit: r1730695 - /subversion/trunk/subversion/include/svn_error_codes.h

Author: stsp
Date: Tue Feb 16 14:46:18 2016
New Revision: 1730695

URL: http://svn.apache.org/viewvc?rev=1730695&view=rev
Log:
Declare a new error code for use by the conflict resolver in libsvn_client.

* subversion/include/svn_error_codes.h
  (SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE): Declare.

Modified:
    subversion/trunk/subversion/include/svn_error_codes.h

Modified: subversion/trunk/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error_codes.h?rev=1730695&r1=1730694&r2=1730695&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_error_codes.h (original)
+++ subversion/trunk/subversion/include/svn_error_codes.h Tue Feb 16 14:46:18 2016
@@ -1246,6 +1246,11 @@ SVN_ERROR_START
              SVN_ERR_CLIENT_CATEGORY_START + 23,
              "The operation is forbidden by the server")
 
+  /** @since New in 1.10. */
+  SVN_ERRDEF(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
+             SVN_ERR_CLIENT_CATEGORY_START + 24,
+             "The conflict resolution option is not applicable")
+
   /* misc errors */
 
   SVN_ERRDEF(SVN_ERR_BASE,