From 1e8484f8214935266f669a0f94bc0bcb0609d208 Mon Sep 17 00:00:00 2001
From: glasser <glasser@612f8ebc-c883-4be0-9ee0-a4e9ef946e3a>
Date: Fri, 25 Jan 2008 22:38:17 +0000
Subject: [PATCH] *
 subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java  
 Update various error codes (reintegrate, get rid of sqlite,   mergeinfo typo,
 bad UUID, ra-partial-replay) using gen-javahl-errors.py.

git-svn-id: http://svn.collab.net/repos/svn/trunk@29049 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
---
 .../javahl/src/org/tigris/subversion/javahl/ErrorCodes.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java
index 42b34cd6d..c8a4c9939 100644
--- a/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java
+++ b/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ErrorCodes.java
@@ -19,6 +19,7 @@ public class ErrorCodes
     public static final int badPropertyValue = 125005;
     public static final int badVersionFileFormat = 125006;
     public static final int badRelativePath = 125007;
+    public static final int badUuid = 125008;
     public static final int xmlAttribNotFound = 130000;
     public static final int xmlMissingAncestry = 130001;
     public static final int xmlUnknownEncoding = 130002;
@@ -117,9 +118,7 @@ public class ErrorCodes
     public static final int fsUnsupportedFormat = 160043;
     public static final int fsRepBeingWritten = 160044;
     public static final int fsTxnNameTooLong = 160045;
-    public static final int fsSqliteError = 160046;
-    public static final int fsNoSuchNodeOrigin = 160047;
-    public static final int fsSqliteReadonly = 160048;
+    public static final int fsNoSuchNodeOrigin = 160046;
     public static final int reposLocked = 165000;
     public static final int reposHookFailure = 165001;
     public static final int reposBadArgs = 165002;
@@ -139,6 +138,7 @@ public class ErrorCodes
     public static final int raUnsupportedAbiVersion = 170006;
     public static final int raNotLocked = 170007;
     public static final int raUnknownCapability = 170008;
+    public static final int raPartialReplayNotSupported = 170009;
     public static final int raDavSockInit = 175000;
     public static final int raDavCreatingRequest = 175001;
     public static final int raDavRequestFailed = 175002;
@@ -180,6 +180,7 @@ public class ErrorCodes
     public static final int clientMissingLockToken = 195013;
     public static final int clientMultipleSourcesDisallowed = 195014;
     public static final int clientNoVersionedParent = 195015;
+    public static final int clientNotReadyToMerge = 195016;
     public static final int base = 200000;
     public static final int pluginLoadFailure = 200001;
     public static final int malformedFile = 200002;
@@ -200,7 +201,7 @@ public class ErrorCodes
     public static final int propertyNotFound = 200017;
     public static final int noAuthFilePath = 200018;
     public static final int versionMismatch = 200019;
-    public static final int mergeInfoParseError = 200020;
+    public static final int mergeinfoParseError = 200020;
     public static final int ceaseInvocation = 200021;
     public static final int revnumParseFailure = 200022;
     public static final int iterBreak = 200023;
-- 
2.11.4.GIT