Index: subversion/libsvn_wc/update_editor.c =================================================================== --- subversion/libsvn_wc/update_editor.c (revision 27569) +++ subversion/libsvn_wc/update_editor.c (working copy) @@ -297,13 +297,12 @@ static apr_status_t cleanup_dir_baton(void *dir_baton) { struct dir_baton *db = dir_baton; - svn_error_t *err; + svn_error_t *err = SVN_NO_ERROR; apr_status_t apr_err; svn_wc_adm_access_t *adm_access; apr_pool_t *pool = apr_pool_parent_get(db->pool); - err = flush_log(db, pool); - if (! err && db->log_number > 0) + if (db->log_number > 0) { err = svn_wc_adm_retrieve(&adm_access, db->edit_baton->adm_access, db->path, pool); Index: subversion/tests/cmdline/update_tests.py =================================================================== --- subversion/tests/cmdline/update_tests.py (revision 27575) +++ subversion/tests/cmdline/update_tests.py (working copy) @@ -3815,7 +3815,7 @@ test_list = [ None, server_sends_copyfrom_on_update), update_copied_from_replaced_and_changed, update_accept_conflicts, - XFail(eof_in_interactive_conflict_resolver), + eof_in_interactive_conflict_resolver, ] if __name__ == '__main__':