subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1697685 - /subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
Date Tue, 25 Aug 2015 14:30:40 GMT
Author: julianfoad
Date: Tue Aug 25 14:30:40 2015
New Revision: 1697685

URL: http://svn.apache.org/r1697685
Log:
On the 'move-tracking-2' branch: Update some comments about 'resurrection'.

* subversion/include/private/svn_editor3e.h
  Update some comments.

Modified:
    subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h

Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h?rev=1697685&r1=1697684&r2=1697685&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h Tue Aug
25 14:30:40 2015
@@ -44,17 +44,20 @@ extern "C" {
 
 /*
  * ===================================================================
- * Versioning Model Assumed
+ * Some Characteristics of this Versioning Model
  * ===================================================================
  *
- *   - per-node, copying-is-branching
+ *   - the versioned state of an element consists of:
+ *        its tree linkage (parent element identity, name)
+ *        its payload (props, text, link-target)
+ *
+ *   - an element can be resurrected with the same element id that it
+ *        had before it was deleted, even if it had been deleted from
+ *        all branches
+ *
  *   - copying is independent per node: a copy-child is not detectably
  *     "the same copy" as its parent, it's just copied at the same time
  *       => (cp ^/a@5 b; del b/c; cp ^/a/c@5 b/c) == (cp ^/a@5 b)
- *   - a node-rev's versioned state consists of:
- *        its tree linkage (parent element identity, name)
- *        its payload (props, text, link-target)
- *   - resurrection is supported
  *
  * ===================================================================
  * Possible contexts (uses) for an editor
@@ -489,20 +492,6 @@ extern "C" {
  */
 /*#define SVN_EDITOR3_WITH_COPY_FROM_THIS_REV*/
 
-/*
- * ===================================================================
- * Resurrection
- * ===================================================================
- *
- * Resurrection is needed in a branching model where element ids are the
- * key to matching up corresponding nodes between "big branches".
- *
- * Resurrection is not needed in a per-node branching model. A copy is
- * sufficient to restore a previously deleted node, as there is no need
- * to keep its old node-branch-id.
- */
-/*#define SVN_EDITOR3_WITH_RESURRECTION*/
-
 
 /**
  * @defgroup svn_editor The editor interface



Mime
View raw message