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 2010/06/25 16:58:20 UTC
svn commit: r958000 - in /subversion/trunk/subversion/libsvn_wc: adm_ops.c
entries.c entries.h
Author: rhuijben
Date: Fri Jun 25 14:58:20 2010
New Revision: 958000
URL: http://svn.apache.org/viewvc?rev=958000&view=rev
Log:
Remove another obsolete entry modify flag.
* subversion/libsvn_wc/adm_ops.c
(svn_wc_add4): Remove obsolete setting of checksum which doesn't
apply to directories.
* subversion/libsvn_wc/entries.c
(fold_entry): Remove folding.
(svn_wc__entry_modify_stub): Remove flag from assertion.
* subversion/libsvn_wc/entries.h
(SVN_WC__ENTRY_MODIFY_CHECKSUM): Remove define.
Modified:
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/entries.h
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=958000&r1=957999&r2=958000&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Fri Jun 25 14:58:20 2010
@@ -1417,15 +1417,6 @@ svn_wc_add4(svn_wc_context_t *wc_ctx,
modify_flags |= SVN_WC__ENTRY_MODIFY_COPIED;
}
- /* If this is a replacement we want to remove the checksum and the property
- flags so they are not set to their respective old values. */
- if (is_replace)
- {
- tmp_entry.checksum = NULL;
- modify_flags |= SVN_WC__ENTRY_MODIFY_CHECKSUM;
- }
-
-
/* Store the pristine properties to install them on working, because
we might delete the base table */
if ((exists && status != svn_wc__db_status_not_present)
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=958000&r1=957999&r2=958000&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Fri Jun 25 14:58:20 2010
@@ -2616,11 +2616,7 @@ fold_entry(svn_wc_entry_t *cur_entry,
/* Schedule: handled by caller. */
- /* Checksum */
- if (modify_flags & SVN_WC__ENTRY_MODIFY_CHECKSUM)
- cur_entry->checksum = entry->checksum
- ? apr_pstrdup(pool, entry->checksum)
- : NULL;
+ /* Checksum is no longer passed to entry_modify() */
/* Copy-related stuff */
if (modify_flags & SVN_WC__ENTRY_MODIFY_COPIED)
@@ -2998,7 +2994,6 @@ svn_wc__entry_modify_stub(svn_wc__db_t *
| SVN_WC__ENTRY_MODIFY_COPYFROM_URL
| SVN_WC__ENTRY_MODIFY_COPYFROM_REV
| SVN_WC__ENTRY_MODIFY_COPIED
- | SVN_WC__ENTRY_MODIFY_CHECKSUM
)) == 0);
return svn_error_return(entry_modify(db, local_abspath,
svn_node_dir, TRUE,
Modified: subversion/trunk/subversion/libsvn_wc/entries.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.h?rev=958000&r1=957999&r2=958000&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.h (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.h Fri Jun 25 14:58:20 2010
@@ -43,7 +43,6 @@ extern "C" {
/* ### gap */
#define SVN_WC__ENTRY_MODIFY_KIND 0x00000004
/* ### gap */
-#define SVN_WC__ENTRY_MODIFY_CHECKSUM 0x00000010
#define SVN_WC__ENTRY_MODIFY_SCHEDULE 0x00000020
#define SVN_WC__ENTRY_MODIFY_COPIED 0x00000040
#define SVN_WC__ENTRY_MODIFY_COPYFROM_URL 0x00000100