You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/12/21 20:36:09 UTC
svn commit: r1425105 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: julianfoad
Date: Fri Dec 21 19:36:09 2012
New Revision: 1425105
URL: http://svn.apache.org/viewvc?rev=1425105&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
Add a teeny bit more detail to the top-of-file comment.
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=1425105&r1=1425104&r2=1425105&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:36:09 2012
@@ -23,8 +23,9 @@
/* This editor is used during resolution of tree conflicts.
*
- * An operation such as update can produce incoming changes for a
- * locally moved-away subtree, causing a tree-conflict to be flagged.
+ * When an update (or switch) produces incoming changes for a locally
+ * moved-away subtree, it updates the base nodes of the moved-away tree
+ * and flags a tree-conflict on the moved-away root node.
* This editor transfers these changes from the moved-away part of the
* working copy to the corresponding moved-here part of the working copy.
*