subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1425098 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Date Fri, 21 Dec 2012 19:08:44 GMT
Author: philip
Date: Fri Dec 21 19:08:44 2012
New Revision: 1425098

URL: http://svn.apache.org/viewvc?rev=1425098&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c: Further extend top-level
   description.

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

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1425098&r1=1425097&r2=1425098&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Dec 21 19:08:44 2012
@@ -39,7 +39,8 @@
  * layer. The destination may have additional higher op-depths
  * representing adds, deletes, moves within the move destination.
  *
- * After the intial move an update has modified the NODES in the move
+ * After the intial move an update, or this editor for trees that have
+ * been moved more than once, has modified the NODES in the move
  * source, and introduced a tree-conflict since the source and
  * destination trees are no longer equivalent.  The source is a
  * different revision and may have text, property and tree changes
@@ -51,9 +52,11 @@
  *
  * The whole drive occurs as one single wc.db transaction.  At the end
  * of the transaction the destination NODES table should have a layer
- * that is equivalent to the source NODES layer, and there should be
+ * that is equivalent to the source NODES layer, there should be
  * workqueue items to make any required changes to working
- * files/directories.
+ * files/directories in the move destination, and there should be
+ * tree-conflicts in the move destination where it was not possible to
+ * update the working files/directories.
  */
 
 #define SVN_WC__I_AM_WC_DB



Mime
View raw message