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

[Amaury Forgeot d'Arc]

Hi,

> Let’s turn one error into an occasion for learning:
>
> > Log:
> > Manually merge r84187
>
> I was bad with numbers and actually ran svnmerge merge -r 81417, which
> did nothing. Since I have manually merged now, do I have to update the
> bookkeeping information manually? My understanding of the dev FAQ is:
> svnmerge block -r 84187. Is that right?

The doc for "svnmerge block" says:

"""
    Do not use this option to hide revisions that were manually merged
    into the branch.  Instead, use 'svnmerge merge --record-only', which
    records that a merge happened (as opposed to a merge which should
    not happen).
"""

Cheers,

-- 
Amaury Forgeot d'Arc