Home Original page

[Python-Dev] I am now lost

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

R. David Murray rdmurray at bitdance.com
Sat Mar 19 16:49:51 CET 2011 
On Sat, 19 Mar 2011 09:25:07 -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:

Note that if you want doc changes to appear in all the current doc sets
(2.7, 3.2, dev), then you should start with patching 3.2 and merge it
into default, and also patch 2.7, just like any other bug-fix commit.
Making doc changes to all current doc sets is our normal practice (unless,
of course, they are about new features).  You can also optionally start
your patching with 3.1, since the 3.1 docs will be re-generated one last
time for its upcoming last bugfix release.  It's easy enough (now that we
no longer have to deal with svnmerge) that I've been doing that, myself.

--
R. David Murray           http://www.bitdance.com
More information about the Python-Dev mailing list