svn commit: r921855 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

[ne...@apache.org]

Author: neels
Date: Thu Mar 11 14:08:43 2010
New Revision: 921855

URL: http://svn.apache.org/viewvc?rev=921855&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
  (svn_wc__get_pristine_contents, svn_wc_get_pristine_contents2):
    Fix enum value mixup from r921848.

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

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=921855&r1=921854&r2=921855&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Mar 11 14:08:43 2010
@@ -2230,7 +2230,7 @@ svn_wc__get_pristine_contents(svn_stream
         }
     }
   else
-  if (status == svn_wc__db_status_base_deleted)
+  if (status == svn_wc__db_status_not_present)
     /* We know that the delete of this node has been committed.
        This should be the same as if called on an unknown path. */
     return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
@@ -2241,7 +2241,6 @@ svn_wc__get_pristine_contents(svn_stream
   else 
   if (status == svn_wc__db_status_absent
       || status == svn_wc__db_status_excluded
-      || status == svn_wc__db_status_not_present
       || status == svn_wc__db_status_incomplete)
     return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
                              _("Cannot get the pristine contents of '%s' "
@@ -2249,10 +2248,12 @@ svn_wc__get_pristine_contents(svn_stream
                              svn_dirent_local_style(local_abspath,
                                                     scratch_pool));
   else
-    /* We know that it is a file, so we can't hit the _obstructed stati. */
+    /* We know that it is a file, so we can't hit the _obstructed stati.
+       Also, we should never see _base_deleted here. */
     SVN_ERR_ASSERT(status != svn_wc__db_status_obstructed
                    && status != svn_wc__db_status_obstructed_add
-                   && status != svn_wc__db_status_obstructed_delete);
+                   && status != svn_wc__db_status_obstructed_delete
+                   && status != svn_wc__db_status_base_deleted);
 
   /* ### TODO: use pristine store. */