[Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch

["Martin v. Löwis"]

> svn up
> svnmerge
> ... conflicts
> svn revert -R .
> svn up
> svnmerge
> ... same conflicts

Ah. In the 3.0 branch, always do "svn revert ." after svnmerge.
It's ok (Nick says it isn't exactly ok, but I don't understand why)

Martin