Author: kfogel
Date: Sat Feb 12 21:18:07 2022
New Revision: 1898020
URL: http://svn.apache.org/viewvc?rev=1898020&view=rev
Log:
Update BRANCH-README to reflect merge of r1897946.
Modified:
subversion/branches/pristines-on-demand-on-mwf/BRANCH-README
Modified: subversion/branches/pristines-on-demand-on-mwf/BRANCH-README
URL:
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/BRANCH-README?rev=1898020&r1=1898019&r2=1898020&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/BRANCH-README (original)
+++ subversion/branches/pristines-on-demand-on-mwf/BRANCH-README Sat Feb 12
21:18:07 2022
@@ -1,3 +1,16 @@
+This branch is the rebase of the 'pristines-on-demand' branch on top
+of the 'multi-format-wc' branch, as part of resolving issue #525.
+
+Each of the two original branches had its own 'BRANCH-README' file;
+what follows is just those two files concatenated one after the other.
+(If this combined branch turns out to be long-lived, then we may do a
+more thoughtful merge of the two files at some point, but for now we
+expect this branch to be merged to trunk pretty soon anyway.)
+
+============================================================================
+BRANCH-README from 'multi-format-wc':
+============================================================================
+
Client support for multiple working copy versions
-------------------------------------------------
@@ -51,6 +64,8 @@ OPTIONAL: The "svn upgrade" command may
============================================================================
+BRANCH-README from 'pristines-on-demand':
+============================================================================
Pristines-on-Demand
-------------------
