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

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

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

Modified: subversion/branches/shelve-checkpoint3/BRANCH-README
URL: 
http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint3/BRANCH-README?rev=1806061&r1=1806060&r2=1806061&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint3/BRANCH-README (original)
+++ subversion/branches/shelve-checkpoint3/BRANCH-README Thu Aug 24 15:32:24 
2017
@@ -1,9 +1,24 @@
-This branch is for prototyping Checkpointing backed by a local repository
+This branch is for development of Checkpointing [0,1].
+
+Specifically, this branch is for Checkpointing backed by a local repository
 embedded within the WC, referred to as design "option 3" in [1].
 
 Branch type: dev branch off 'shelve' branch; updated by full merges from
 there; not 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.
+
 Initially this is prototyping, to explore the general shape of the design
 and user interface. As such, the coding style is hacky and does not comply
 with Subversion coding requirements.


Reply via email to