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

[antoine.pitrou]

Author: antoine.pitrou
Date: Fri Feb 25 19:57:52 2011
New Revision: 88597

Log:
Finally remove commented out text.



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:57:52 2011
@@ -95,10 +95,6 @@
 We propose to use named branches for release branches and adopt cloned
 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
 ------------------
@@ -146,36 +142,6 @@
     [...]
 
 
-.. 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
 ---------------