>    svnmerge.py -r<revfrom3k>
>    svn revert .
>    svn commit -F svnmerge-commit-something-press-tab
>
> --------8<----------------
>
> I think it was later corrected that the "svn revert" should be "svn
> resolved", if it's needed at all. But I'm not sure about that. As I
> recall, I've never needed that step.

It should be needed every time you merge into the 3.0 branch, and
yes, it should be "resolved", not "revert".