diff --git a/pep-0385.txt b/pep-0385.txt index 608ad6bf1..236f37ee9 100644 --- a/pep-0385.txt +++ b/pep-0385.txt @@ -106,26 +106,31 @@ History management 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 .. -------------------