Author: julianfoad
Date: Thu Nov 16 10:46:56 2017
New Revision: 1815436

URL: http://svn.apache.org/viewvc?rev=1815436&view=rev
Log:
On the 'shelve-checkpoint' branch: Update BRANCH-README.

Modified:
    subversion/branches/shelve-checkpoint/BRANCH-README

Modified: subversion/branches/shelve-checkpoint/BRANCH-README
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/BRANCH-README?rev=1815436&r1=1815435&r2=1815436&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/BRANCH-README (original)
+++ subversion/branches/shelve-checkpoint/BRANCH-README Thu Nov 16 10:46:56 2017
@@ -3,24 +3,22 @@ This branch is for development of Checkp
 Specifically, this branch is for Checkpointing backed by a series of patches
 stored within the WC, referred to as design "option 1" in [1].
 
-Branch type: dev branch off 'shelve' branch; updated by full merges from
-there; not intended to be merged to trunk.
+Branch type: dev branch off trunk; updated by full merges from trunk;
+not yet intended to be merged to trunk.
 
 The following branching hierarching shows the intended propogation of changes,
 although the actual copy history of the branches is not as shown here.
 
-    trunk          ------------------------    .  catch-up
-                       \                       |   merges
-    branches/shelve     +------------------    V   .   .
-                            \ \                    |   |
-    branches/checkpoint      \ +-----------        V   |
-                              \                        |
-    branches/checkpoint3       +-----------            V
-
-Both of the Checkpointing branches therefore include Shelving functionality.
-
-This branch is now at the point of being ready for user testing, and should
-be up to Subversion coding standards, in preparation for merging to trunk.
+    trunk          ------------------------   catch-up
+                           \ \                 merges
+                            \ \                |   |
+    branches/checkpoint      \ +-----------    V   |
+                              \                    |
+    branches/checkpoint3       +-----------        V
+
+Initially this is prototyping, to explore the general shape of the design and
+user interface. As such, it does not take care over details of APIs and error
+handling and so on.
 
 References:
    [0] dev@ thread "[RFC] Shelving and Checkpointing", J Foad, 2017-07-10.


Reply via email to