Finally remove commented out text.

This commit is contained in:
Antoine Pitrou 2011-02-25 18:57:52 +00:00
parent 5282918a2e
commit dc43e1c81b
1 changed files with 0 additions and 34 deletions

View File

@ -95,10 +95,6 @@ Differences between named branches and cloned branches:
We propose to use named branches for release branches and adopt cloned We propose to use named branches for release branches and adopt cloned
branches for feature branches. branches for feature branches.
.. with one exception to this rule: the 3.x branches will be kept in
.. separate clones from the 2.x branches. I think this provides an
.. optimal hybrid approach for Python's uses of branching.
History management History management
------------------ ------------------
@ -146,36 +142,6 @@ directory. Its format is as following::
[...] [...]
.. Converting branches
.. -------------------
.. There are quite a lot of branches in SVN's branches directory. We
.. propose to clean this up a bit, by following this basic strategy:
.. * Keep all release (maintenance) branches
.. * Discard branches that haven't been touched in 18 months, unless
.. somone indicates there's still interest in such a branch
.. * Keep branches that have been touched in the last 18 months, unless
.. someone indicates the branch can be deprecated
.. There's a `branch map`_ available that shows info about each branch:
.. * keep-clone means we'll keep that branch in a separate clone
.. * keep-named means we'll keep that branch as a named branch in one of
.. the clones
.. * strip means we won't keep that branch
.. * streamed-merge means that it got merged by committing several new
.. revisions to the other branch
.. * merged-r* means the branch got merged in the named revision
.. * merges? means we haven't checked/found out yet whether that branch
.. was ever merged
.. * ? means that your input would be even more helpful than for the
.. other items
.. * some items have no action yet, feel free to treat that as just '?'
.. .. _branch map: http://hg.python.org/pymigr/file/tip/all-branches.txt
Converting tags Converting tags
--------------- ---------------