[Python-Dev] I am now lost - committed, pulled, merged, what is "collapse"?

[R. David Murray]

On Sat, 19 Mar 2011 13:53:11 -0500, skip at pobox.com wrote:
> 
>     >> I have a trivial little documentation patch for csv.rst.  I committed
>     >> it locally, then I pulled and merged:
> 
>     RDM> Note that if you want doc changes to appear in all the current doc
>     RDM> sets (2.7, 3.2, dev), then you should start with patching 3.2 and
>     RDM> merge it into default, and also patch 2.7, just like any other
>     RDM> bug-fix commit.
> 
> Sorry, I found updating cpython hard enough.  I almost gave up on just that
> one simple change.
> 
> Anyway, I thought I was supposed to pull from head to 3.2 and 2.7.  What is
> "dev"?

That's "doc speak", I guess.  http://docs.python.org/dev/library, for
example, points to the library reference for the docs on the default
branch.

--
R. David Murray           http://www.bitdance.com