svn commit: r1089615 - /subversion/trunk/subversion/libsvn_wc/wc_db.c

[hw...@apache.org]

Author: hwright
Date: Wed Apr  6 20:16:27 2011
New Revision: 1089615

URL: http://svn.apache.org/viewvc?rev=1089615&view=rev
Log:
Followup to r1089560 by actually ensuring the triggers are deleted when
finished setting changelists (even if we encounter an error of some kind).

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_op_set_changelist): Compose errors, instead of directly returning,
    so as to ensure the triggers get deleted appropriately.

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1089615&r1=1089614&r2=1089615&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Apr  6 20:16:27 2011
@@ -3475,15 +3475,18 @@ svn_wc__db_op_set_changelist(svn_wc__db_
                                     svn_sqlite__exec_statements(wcroot->sdb,
                                         STMT_DROP_CHANGELIST_LIST_TRIGGERS));
 
-  SVN_ERR(svn_wc__db_with_txn(wcroot, local_relpath, set_changelist_txn,
-                              (void *) changelist, scratch_pool));
+  err = svn_wc__db_with_txn(wcroot, local_relpath, set_changelist_txn,
+                            (void *) changelist, scratch_pool);
 
-  SVN_ERR(svn_sqlite__exec_statements(wcroot->sdb,
+  err = svn_error_compose_create(err,
+                                 svn_sqlite__exec_statements(wcroot->sdb,
                                       STMT_DROP_CHANGELIST_LIST_TRIGGERS));
 
-  SVN_ERR(flush_entries(wcroot, local_abspath, scratch_pool));
+  err = svn_error_compose_create(err,
+                                 flush_entries(wcroot, local_abspath,
+                                               scratch_pool));
 
-  return SVN_NO_ERROR;
+  return err;
 }