svn commit: r1004975 - /subversion/trunk/notes/wc-ng/nodes

[ph...@apache.org]

Author: philip
Date: Wed Oct  6 10:35:51 2010
New Revision: 1004975

URL: http://svn.apache.org/viewvc?rev=1004975&view=rev
Log:
* notes/wc-ng/nodes: Discuss the non-replacement of children.

Modified:
    subversion/trunk/notes/wc-ng/nodes

Modified: subversion/trunk/notes/wc-ng/nodes
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/wc-ng/nodes?rev=1004975&r1=1004974&r2=1004975&view=diff
==============================================================================
--- subversion/trunk/notes/wc-ng/nodes (original)
+++ subversion/trunk/notes/wc-ng/nodes Wed Oct  6 10:35:51 2010
@@ -210,9 +210,12 @@ new op_depth and presence value 'deleted
 
 Adding a tree on top of the same oproot will cause the oproot -
 and all overlapping children! - to switch their presence value to
-'normal'.  The children should not be considered a replacement or
-addition: their tree depths don't correspond to the op_depth, meaning
-the nodes themselves should not be considered restructured.
+'normal'.  When a node replaces a deleted node it hides any deleted
+children of the previously deleted node, and may come with children of
+its own.  Some of the new children may have the same names as some of
+the deleted children, but these overlapping children should not be
+considered restructuring replacements.  Only the parent, with op_depth
+equal to the tree depth, is a restructuring replacement.
 
 ### JAF: I don't understand what that last sentence refers to at all.