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/11 19:05:04 UTC
svn commit: r953773 - in /subversion/trunk/subversion/libsvn_wc: entries.c
entries.h
Author: rhuijben
Date: Fri Jun 11 17:05:04 2010
New Revision: 953773
URL: http://svn.apache.org/viewvc?rev=953773&view=rev
Log:
Following up on r953765, remove the handling of changing absent
from the entry folding.
* subversion/libsvn_wc/entries.c
(fold_entry): Remove absent flag.
(svn_wc__entry_modify_stub): Remove flag from assertion.
* subversion/libsvn_wc/entries.h
(SVN_WC__ENTRY_MODIFY_ABSENT): Remove define.
Modified:
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/entries.h
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=953773&r1=953772&r2=953773&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Fri Jun 11 17:05:04 2010
@@ -2637,9 +2637,7 @@ fold_entry(svn_wc_entry_t *cur_entry,
if (modify_flags & SVN_WC__ENTRY_MODIFY_DELETED)
cur_entry->deleted = entry->deleted;
- /* Absent state */
- if (modify_flags & SVN_WC__ENTRY_MODIFY_ABSENT)
- cur_entry->absent = entry->absent;
+ /* Absent state is no longer passed to entry_modify() */
/* text_time, prop_time no longer passed to entry_modify() */
@@ -3017,7 +3015,6 @@ svn_wc__entry_modify_stub(svn_wc__db_t *
/* from update_editor.c */
| SVN_WC__ENTRY_MODIFY_KIND
| SVN_WC__ENTRY_MODIFY_DELETED
- | SVN_WC__ENTRY_MODIFY_ABSENT
| SVN_WC__ENTRY_MODIFY_SCHEDULE
| SVN_WC__ENTRY_MODIFY_FORCE
Modified: subversion/trunk/subversion/libsvn_wc/entries.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.h?rev=953773&r1=953772&r2=953773&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.h (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.h Fri Jun 11 17:05:04 2010
@@ -51,8 +51,6 @@ extern "C" {
#define SVN_WC__ENTRY_MODIFY_COPYFROM_URL 0x00000100
#define SVN_WC__ENTRY_MODIFY_COPYFROM_REV 0x00000200
/* ### gap */
-#define SVN_WC__ENTRY_MODIFY_ABSENT 0x00004000
-/* ### gap */
/* ...ORed together with this to mean: just set the schedule to the new
value, instead of treating the new value as a change of state to be