[Python-checkins] r88595 - peps/trunk/pep-0385.txt

[antoine.pitrou]

Author: antoine.pitrou
Date: Fri Feb 25 19:52:39 2011
New Revision: 88595

Log:
Clarify that the work repo is really sufficient



Modified:
   peps/trunk/pep-0385.txt

Modified: peps/trunk/pep-0385.txt
==============================================================================
--- peps/trunk/pep-0385.txt	(original)
+++ peps/trunk/pep-0385.txt	Fri Feb 25 19:52:39 2011
@@ -106,26 +106,31 @@
 In order to minimize the loss of information due to the conversion, we
 propose to provide several repositories as a conversion result:
 
-* A repository with the full, unedited conversion of the Subversion
-  repository (actually, its /python subdirectory) -- this is called
-  the "historic" or "archive" repo and will be offered as a read-only
-  resource. [2]_
-
 * A repository trimmed to the mainline trunk (and py3k), as well as
   past and present maintenance branches -- this is called the
-  "working" repo and is where development continues.
+  "working" repo and is where development continues.  This repository has
+  all the history needed for development work, including annotating
+  source files with changes back up to 1990 and other common history-digging
+  operations.
 
   The ``default`` branch in that repo is what is known as ``py3k`` in
   Subversion, while the Subversion trunk lives on with the branch name
   ``trunk``; however in Mercurial this branch will be closed.  Release
   branches are named after their major.minor version, e.g. ``3.2``.
 
-* One more repository per active feature branch; "active" means that
-  at least one core developer asks for the branch to be provided.
+* A repository with the full, unedited conversion of the Subversion
+  repository (actually, its /python subdirectory) -- this is called
+  the "historic" or "archive" repo and will be offered as a read-only
+  resource. [2]_
 
-  All other branches are still present in the historic repo, and can
-  be extracted as separate repositories at any time should it prove to
-  be necessary.
+* One more repository per active feature branch; "active" means that
+  at least one core developer asks for the branch to be provided.  Each
+  such repository will contain both the feature branch and all ancestor
+  changesets from mainline (coming from ``trunk`` and/or ``py3k`` in SVN).
+
+Since all branches are present in the historic repo, they can later be
+extracted as separate repositories at any time should it prove to be
+necessary.
 
 .. Converting branches
 .. -------------------