iSharkFly-Open
/
python-peps
mirror of https://github.com/python/peps.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clarify that the work repo is really sufficient

This commit is contained in:
Antoine Pitrou 2011-02-25 18:52:39 +00:00
parent 0352902e8d
commit b294a1a452
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pep-0385.txt
View File

@ -106,26 +106,31 @@ History management
In order to minimize the loss of information due to the conversion, we In order to minimize the loss of information due to the conversion, we
propose to provide several repositories as a conversion result: 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 * A repository trimmed to the mainline trunk (and py3k), as well as
past and present maintenance branches -- this is called the 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 The ``default`` branch in that repo is what is known as ``py3k`` in
Subversion, while the Subversion trunk lives on with the branch name Subversion, while the Subversion trunk lives on with the branch name
``trunk``; however in Mercurial this branch will be closed. Release ``trunk``; however in Mercurial this branch will be closed. Release
branches are named after their major.minor version, e.g. ``3.2``. branches are named after their major.minor version, e.g. ``3.2``.
* One more repository per active feature branch; "active" means that * A repository with the full, unedited conversion of the Subversion
at least one core developer asks for the branch to be provided. 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 * One more repository per active feature branch; "active" means that
be extracted as separate repositories at any time should it prove to at least one core developer asks for the branch to be provided. Each
be necessary. 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 .. Converting branches
.. ------------------- .. -------------------