subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dan...@apache.org
Subject svn commit: r940600 - /subversion/trunk/subversion/libsvn_wc/status.c
Date Mon, 03 May 2010 20:21:56 GMT
Author: dannas
Date: Mon May  3 20:21:56 2010
New Revision: 940600

URL: http://svn.apache.org/viewvc?rev=940600&view=rev
Log:
Add comment to describe why we only check for tree conflicts when setting
status->conflicted for unversioned paths.

It was the only scenario I could come up with and the only one, caught by the
testsuite.

* subversion/libsvn_wc/status.c
  (assemble_status): See above.

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=940600&r1=940599&r2=940600&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Mon May  3 20:21:56 2010
@@ -394,6 +394,8 @@ assemble_status(svn_wc_status3_t **statu
       stat->lock_owner = NULL;
       stat->lock_comment = NULL;
       stat->lock_creation_date = 0;
+      /* For the case of an incoming delete to a locally deleted path during
+       * an update, we get a tree conflict. */
       stat->conflicted = (tree_conflict != NULL);
 
       *status = stat;



Mime
View raw message