You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2012/06/30 06:01:24 UTC
svn commit: r1355628 - in /subversion/branches/1.7.x: ./ STATUS
subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
Author: svn-role
Date: Sat Jun 30 04:01:22 2012
New Revision: 1355628
URL: http://svn.apache.org/viewvc?rev=1355628&view=rev
Log:
Merge r1351772 from trunk:
* r1351772
Add missing new-in-1.7 notification API enum values to JavaHL.
Justification:
Incomplete API in JavaHL bindings. Requested by SVNKit developers.
Votes:
+1: stsp, philip, markphip, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1351772
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1355628&r1=1355627&r2=1355628&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Jun 30 04:01:22 2012
@@ -125,13 +125,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1351772
- Add missing new-in-1.7 notification API enum values to JavaHL.
- Justification:
- Incomplete API in JavaHL bindings. Requested by SVNKit developers.
- Votes:
- +1: stsp, philip, markphip, rhuijben
-
* r1354626, r1354652
Fix JavaHL so as not to assert on non-canonical input
Justification
Modified: subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1355628&r1=1355627&r2=1355628&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Sat Jun 30 04:01:22 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