[Python-Dev] [Python-checkins] r84190 - python/branches/release31-maint/Doc/library/stdtypes.rst

[Eric Smith]

On 8/19/2010 7:55 AM, Éric Araujo wrote:
> Thanks for the replies.
>
> The dev FAQ is clear about regular use, it tells about the
> svnmerge-commit-message too, and people in #python-dev have told me that
> the merge order is py3k>  3.1, py3k>  2.7. My problem here is that I
> committed r84190 in 3.1 manually, but it should have been an svnmerge of
> r84187. So my question is: Do I have to svnmerge block -r84187 in 3.1?

Yes, you should do that.

>> And I use "svnmerge block -r revision" for branches where the commit
>> should not be applied, don't forget to do this.
>
> Oh, this has to be done for every commit? I have for example fixed typos
> in 3.x that don’t apply to 2.7, so I have to block them?

I don't know that this matters, since I don't think anyone's doing mass 
merges in this direction. I tend to do it just for my own bookkeeping 
purposes, though.

Eric.