You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/28 03:14:14 UTC
svn commit: r938743 - /subversion/trunk/subversion/libsvn_wc/workqueue.c
Author: gstein
Date: Wed Apr 28 01:14:14 2010
New Revision: 938743
URL: http://svn.apache.org/viewvc?rev=938743&view=rev
Log:
Remove an unused entry_t
* subversion/libsvn_wc/workqueue.c:
(log_do_committed): remove DIR_ENTRY in the stub reset phase. we don't
need the entry. remove wrapping of the entry_modify_stub call.
Modified:
subversion/trunk/subversion/libsvn_wc/workqueue.c
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=938743&r1=938742&r2=938743&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Wed Apr 28 01:14:14 2010
@@ -1506,15 +1506,10 @@ log_do_committed(svn_wc__db_t *db,
return SVN_NO_ERROR;
}
- /* Make sure our entry exists in the parent. */
+ /* Make sure we have a parent stub in a clean/unmodified state. */
{
- const svn_wc_entry_t *dir_entry;
svn_wc_entry_t tmp_entry;
- /* Check if we have a valid record in our parent */
- SVN_ERR(svn_wc__get_entry(&dir_entry, db, local_abspath,
- FALSE, svn_node_dir, TRUE, pool, pool));
-
tmp_entry.schedule = svn_wc_schedule_normal;
tmp_entry.copied = FALSE;
tmp_entry.deleted = FALSE;
@@ -1522,16 +1517,13 @@ log_do_committed(svn_wc__db_t *db,
If this fails for you in the transition to one DB phase, please
run svn cleanup one level higher. */
- err = svn_wc__entry_modify_stub(db, local_abspath,
- &tmp_entry,
- (SVN_WC__ENTRY_MODIFY_SCHEDULE
- | SVN_WC__ENTRY_MODIFY_COPIED
- | SVN_WC__ENTRY_MODIFY_DELETED
- | SVN_WC__ENTRY_MODIFY_FORCE),
- pool);
- if (err != NULL)
- return svn_error_createf(SVN_ERR_WC_BAD_ADM_LOG, err,
- _("Error modifying entry of '%s'"), "");
+ SVN_ERR(svn_wc__entry_modify_stub(db, local_abspath,
+ &tmp_entry,
+ (SVN_WC__ENTRY_MODIFY_SCHEDULE
+ | SVN_WC__ENTRY_MODIFY_COPIED
+ | SVN_WC__ENTRY_MODIFY_DELETED
+ | SVN_WC__ENTRY_MODIFY_FORCE),
+ pool));
}
return SVN_NO_ERROR;