Index: subversion/include/svn_wc.h
===================================================================
--- subversion/include/svn_wc.h	(revision 30502)
+++ subversion/include/svn_wc.h	(working copy)
@@ -782,9 +782,6 @@
   /** Changelist name cleared. @since New in 1.5. */
   svn_wc_notify_changelist_clear,
 
-  /** Failed to update a path's changelist association. @since New in 1.5. */
-  svn_wc_notify_changelist_failed,
-
   /** Warn user that a path has moved from one changelist to another.
       @since New in 1.5. */
   svn_wc_notify_changelist_moved,
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c	(revision 30502)
+++ subversion/libsvn_wc/adm_ops.c	(working copy)
@@ -2983,6 +2983,7 @@
                                     pool);
       notify->err = unversioned_err;
       notify_func(notify_baton, notify, pool);
+      svn_error_clear(n->err);
     }
   
   /* Tweak the entry. */
Index: subversion/bindings/javahl/native/EnumMapper.cpp
===================================================================
--- subversion/bindings/javahl/native/EnumMapper.cpp	(revision 30502)
+++ subversion/bindings/javahl/native/EnumMapper.cpp	(working copy)
@@ -223,10 +223,6 @@
       /* Changelist name cleared. */
       return org_tigris_subversion_javahl_NotifyAction_changelist_clear;
 
-    case svn_wc_notify_changelist_failed:
-      /* Changelist operation failed. */
-      return org_tigris_subversion_javahl_NotifyAction_changelist_failed;
-
     case svn_wc_notify_merge_begin:
       /* A merge operation has begun. */
       return org_tigris_subversion_javahl_NotifyAction_merge_begin;
Index: subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
===================================================================
--- subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java	(revision 30502)
+++ subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java	(working copy)
@@ -135,15 +135,9 @@
 
     /**
      * @since 1.5
-     * Changelist operation failed.
-     */
-    public static final int changelist_failed = 28;
-
-    /**
-     * @since 1.5
      * A merge operation has begun.
      */
-    public static final int merge_begin = 29;
+    public static final int merge_begin = 28;
 
     /**
      * textual representation of the action types
Index: subversion/svn/notify.c
===================================================================
--- subversion/svn/notify.c	(revision 30502)
+++ subversion/svn/notify.c	(working copy)
@@ -411,14 +411,8 @@
         goto print_error;
       break;
 
-    case svn_wc_notify_changelist_failed:
-      svn_handle_warning(stderr, n->err);
-      svn_error_clear(n->err);
-      break;
-
     case svn_wc_notify_changelist_moved:
       svn_handle_warning(stderr, n->err);
-      svn_error_clear(n->err);
       break;
 
     case svn_wc_notify_merge_begin: