You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/04/08 17:28:49 UTC
svn commit: r1090297 -
/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
Author: rhuijben
Date: Fri Apr 8 15:28:49 2011
New Revision: 1090297
URL: http://svn.apache.org/viewvc?rev=1090297&view=rev
Log:
* subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
(ClientNotifyInformation.Action): Sync notification types after recent changes.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1090297&r1=1090296&r2=1090297&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Fri Apr 8 15:28:49 2011
@@ -467,20 +467,26 @@ public class ClientNotifyInformation ext
* which is unable to be operated on. */
failed_external ("failed external"),
- /** An update tried to add a file or directory at path but an
- * unversioned obstruction was found. */
- update_obstruction ("update obstruction"),
+ /** Starting an update operation */
+ update_started ("update started"),
+
+ /** Skipping an obstruction working copy */
+ update_skip_obstruction ("update skip obstruction"),
+
+ /** Skipping a working only node */
+ update_skip_working_only ("update skip working only"),
/** An update operation removed an external working copy. */
update_external_removed ("update external removed"),
- /** A node below a deleted and tree conflicted directory was added
- * during update. */
- update_add_deleted ("update add deleted"),
-
- /** A node below a deleted and tree conflicted directory was updated.
- */
- update_update_deleted ("update modified deleted"),
+ /** Applying a shadowed add */
+ update_shadowed_add ("update shadowed add"),
+
+ /** Applying a shadowed update */
+ update_shadowed_update ("update shadowed update"),
+
+ /** Applying a shadowed delete */
+ update_shadowed_update ("update shadowed delete"),
/** The mergeinfo on path was updated. */
merge_record_info ("merge record info"),