svn commit: r936177 - /subversion/trunk/subversion/libsvn_wc/entries.c

[gs...@apache.org]

Author: gstein
Date: Wed Apr 21 07:14:21 2010
New Revision: 936177

URL: http://svn.apache.org/viewvc?rev=936177&view=rev
Log:
Relax a constraint when reading entries. These are legal states in the DB,
so we shouldn't error on them.

* subversion/libsvn_wc/entries.c:
  (read_one_entry): allow some states to not have a REPOS_RELPATH

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

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=936177&r1=936176&r2=936177&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Apr 21 07:14:21 2010
@@ -1041,10 +1041,22 @@ read_one_entry(const svn_wc_entry_t **ne
       else
         entry->kind = svn_node_unknown;
 
+      /* We should always have a REPOS_RELPATH, except for:
+         - deleted nodes
+         - certain obstructed nodes
+         - not-present nodes
+         - absent nodes
+         - excluded nodes
+
+         ### the last three should probably have an "implied" REPOS_RELPATH
+      */
       SVN_ERR_ASSERT(repos_relpath != NULL
                      || entry->schedule == svn_wc_schedule_delete
                      || status == svn_wc__db_status_obstructed
                      || status == svn_wc__db_status_obstructed_delete
+                     || status == svn_wc__db_status_not_present
+                     || status == svn_wc__db_status_absent
+                     || status == svn_wc__db_status_excluded
                      );
       if (repos_relpath)
         entry->url = svn_path_url_add_component2(entry->repos,