On Tue, Mar 10, 2009 at 16:13, "Martin v. Löwis" <mar...@v.loewis.de> wrote:
> > 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". I will add it to the FAQ right now. -Brett
_______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
