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 2011/05/17 23:53:12 UTC

svn commit: r1104583 - /subversion/trunk/subversion/libsvn_wc/status.c

Author: rhuijben
Date: Tue May 17 21:53:12 2011
New Revision: 1104583

URL: http://svn.apache.org/viewvc?rev=1104583&view=rev
Log:
* subversion/libsvn_wc/status.c
  (assemble_status): Cover one more easy status.

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

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1104583&r1=1104582&r2=1104583&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue May 17 21:53:12 2011
@@ -575,12 +575,12 @@ assemble_status(svn_wc_status3_t **statu
           if (!info->op_root)
             copied = TRUE; /* And keep status normal */
           else if (info->kind == svn_wc__db_kind_file
-                   && !info->have_base && !info->have_more_work
-                   && !info->has_checksum)
+                   && !info->have_base && !info->have_more_work)
             {
-              /* Simple file addition, no replacement */
+              /* Simple addition or copy, no replacement */
               node_status = svn_wc_status_added;
-              copied = FALSE;
+              /* If an added node has a pristine file, it was copied */
+              copied = info->has_checksum;
             }
           else
             {