Success build TortoiseMerge.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseMerge / svninclude / svn_error_codes.h

diff --git a/src/TortoiseMerge/svninclude/svn_error_codes.h b/src/TortoiseMerge/svninclude/svn_error_codes.h
index 91d3ffb..2a6af70 100644 (file)
--- a/src/TortoiseMerge/svninclude/svn_error_codes.h
+++ b/src/TortoiseMerge/svninclude/svn_error_codes.h
@@ -1,7 +1,7 @@
 /**\r
  * @copyright\r
  * ====================================================================\r
- * Copyright (c) 2000-2008 CollabNet.  All rights reserved.\r
+ * Copyright (c) 2000-2009 CollabNet.  All rights reserved.\r
  *\r
  * This software is licensed as described in the file COPYING, which\r
  * you should have received as part of this distribution.  The terms\r
@@ -42,11 +42,8 @@
 #if defined(SVN_ERROR_BUILD_ARRAY) || !defined(SVN_ERROR_ENUM_DEFINED)\r
 \r
 \r
-#include <apr.h>\r
 #include <apr_errno.h>     /* APR's error system */\r
 \r
-//#include "svn_props.h"     /* For SVN_PROP_EXTERNALS. */\r
-\r
 #ifdef __cplusplus\r
 extern "C" {\r
 #endif /* __cplusplus */\r
@@ -315,6 +312,10 @@ SVN_ERROR_START
              SVN_ERR_ENTRY_CATEGORY_START + 5,\r
              "Entry has an invalid attribute")\r
 \r
+  SVN_ERRDEF(SVN_ERR_ENTRY_FORBIDDEN,\r
+             SVN_ERR_ENTRY_CATEGORY_START + 6,\r
+             "Can't create an entry for a forbidden name")\r
+\r
   /* wc errors */\r
 \r
   SVN_ERRDEF(SVN_ERR_WC_OBSTRUCTED_UPDATE,\r
@@ -841,6 +842,13 @@ SVN_ERROR_START
              SVN_ERR_RA_DAV_CATEGORY_START + 11,\r
              "Repository has been moved")\r
 \r
+  /* SVN_ERR_RA_DAV_CATEGORY_START + 12 is reserved for use in 1.7. */\r
+\r
+  /** @since New in 1.6 */\r
+  SVN_ERRDEF(SVN_ERR_RA_DAV_FORBIDDEN,\r
+             SVN_ERR_RA_DAV_CATEGORY_START + 13,\r
+             "URL access forbidden for unknown reason")\r
+\r
   /* ra_local errors */\r
 \r
   SVN_ERRDEF(SVN_ERR_RA_LOCAL_REPOS_NOT_FOUND,\r