Author: stsp Date: Tue Jun 19 16:39:14 2012 New Revision: 1351772 URL: http://svn.apache.org/viewvc?rev=1351772&view=rev Log: In JavaHL, add missing 'replaced' value to ConflictDescriptor.Reason, corresponding to svn_wc_conflict_reason_replaced; and add 'replace' to ConflictDescriptor.Action, corresponding to svn_wc_conflict_action_replace.
These values are new in Subversion 1.7 but we forgot to add them to JavaHL. * subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (Action): Add 'replace'. (Reason): Add 'replaced'. Patch by: Dmitry Pavlenko <[email protected]> me Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1351772&r1=1351771&r2=1351772&view=diff ============================================================================== --- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (original) +++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Tue Jun 19 16:39:14 2012 @@ -204,7 +204,12 @@ public class ConflictDescriptor /** * Attempting to delete object. */ - delete; + delete, + + /** + * Attempting to replace object. + */ + replace; } /** @@ -240,7 +245,12 @@ public class ConflictDescriptor /** * Object is already added or schedule-add. */ - added; + added, + + /** + * Object is already replaced. + */ + replaced; } public enum Operation
