Hi,
enum svn_wc_conflict_reason_t has 10 possible values but
ConflictDescriptor.Reason from javahl only 6;
as I understand this is because some of svn_wc_conflict_reason_t values are
"experimental" (for 1.8);
but anyway at least 1 of those values is released
(svn_wc_conflict_reason_replaced that is for 1.7). So a corresponding value
should be added to javahl.
If you accept this patch, I would also ask you to backport it to branches/1.7.x.
[[[
Add missing 'replace' value to ConflictDescriptor.Reason enum
corresponding to svn_wc_conflict_reason_replaced.
*
subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
(Reason): Add 'replace' value.
]]]
[[[
Index:
subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
===================================================================
---
subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
(revision 1351459)
+++
subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
(working copy)
@@ -241,6 +241,11 @@ public class ConflictDescriptor
* Object is already added or schedule-add.
*/
added;
+
+ /**
+ * Object is already replaced.
+ */
+ replaced;
}
public enum Operation
]]]
