Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c	(revision 10122)
+++ subversion/libsvn_wc/status.c	(working copy)
@@ -755,10 +755,20 @@
      directory.  */
   if (entry)
     {
-      /* If ENTRY is unversioned, send its unversioned status. */
-      if (apr_hash_get (dirents, entry, APR_HASH_KEY_STRING)
-          && (! apr_hash_get (entries, entry, APR_HASH_KEY_STRING)))
+      const svn_wc_entry_t *entry_entry;
+      entry_entry = apr_hash_get (entries, entry, APR_HASH_KEY_STRING);
+
+      /* If ENTRY is versioned, send its versioned status. */
+      if (entry_entry)
         {
+          SVN_ERR (handle_dir_entry (eb, adm_access, entry, dir_entry, 
+                                     entry_entry, ignores, descend, get_all, 
+                                     no_ignore, status_func, status_baton, 
+                                     cancel_func, cancel_baton, subpool));
+        }
+      /* Otherwise, if it exists, send its unversioned status. */
+      else if (apr_hash_get (dirents, entry, APR_HASH_KEY_STRING))
+        {
           svn_node_kind_t kind;
           fullpath = svn_path_join (path, entry, subpool);
           SVN_ERR (svn_io_check_path (path, &kind, subpool));
@@ -766,16 +776,6 @@
                                           patterns, eb->externals, no_ignore, 
                                           status_func, status_baton, subpool));
         }
-      /* Otherwise, send its versioned status. */
-      else
-        {
-          const svn_wc_entry_t *entry_entry;
-          entry_entry = apr_hash_get (entries, entry, APR_HASH_KEY_STRING);
-          SVN_ERR (handle_dir_entry (eb, adm_access, entry, dir_entry, 
-                                     entry_entry, ignores, descend, get_all, 
-                                     no_ignore, status_func, status_baton, 
-                                     cancel_func, cancel_baton, subpool));
-        }
 
       /* Regardless, we're done here.  Let's go home. */
       return SVN_NO_ERROR;