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

["Martin v. Löwis"]

> There are potential problems with doing it that way [1]. The safer
> option is to do:
> 
> svn revert .
> svnmerge merge -M -F <py3k-rev>

I still don't see the potential problem. If you do svnmerge, svn commit,
all is fine, right? The problem *only* arises if you do svnmerge,
svn up, svn commit - and clearly, you shouldn't do that. If, on commit,
you get a conflict, you should revert all your changes, svn up, and
start all over with the merge.

Regards,
Martin