svn commit: r1806059 - /subversion/branches/shelve/BRANCH-README

[ju...@apache.org]

Author: julianfoad
Date: Thu Aug 24 15:32:21 2017
New Revision: 1806059

URL: http://svn.apache.org/viewvc?rev=1806059&view=rev
Log:
On the 'shelve' branch: In BRANCH-README, explain the branch relationships.

Modified:
    subversion/branches/shelve/BRANCH-README

Modified: subversion/branches/shelve/BRANCH-README
URL: http://svn.apache.org/viewvc/subversion/branches/shelve/BRANCH-README?rev=1806059&r1=1806058&r2=1806059&view=diff
==============================================================================
--- subversion/branches/shelve/BRANCH-README (original)
+++ subversion/branches/shelve/BRANCH-README Thu Aug 24 15:32:21 2017
@@ -1,7 +1,20 @@
-This branch is for development of Shelving and Checkpointing.
+This branch is for development of Shelving [0,1].
 
 Branch type: dev branch off trunk; updated by full merges from 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.
+
 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.