Author: julianfoad
Date: Thu Aug 24 15:32:22 2017
New Revision: 1806060
URL: http://svn.apache.org/viewvc?rev=1806060&view=rev
Log:
On the 'checkpoint' branch: In BRANCH-README, explain the branch relationships.
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=1806060&r1=1806059&r2=1806060&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/BRANCH-README (original)
+++ subversion/branches/shelve-checkpoint/BRANCH-README Thu Aug 24 15:32:22 2017
@@ -1,9 +1,23 @@
-This branch is for development of Shelving and Checkpointing.
+This branch is for development of Checkpointing [0,1].
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 trunk; updated by full merges from trunk.
+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, it does not take care over details of APIs and error
