> svn revert .
> svnmerge -M -F <py3k-rev>

[are you sure you don't need a command for svnmerge here?]

Instead of these two, I always do

  svn resolved .

Regards,
Martin
_______________________________________________
Python-Dev mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-dev
Unsubscribe: 
http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com

Reply via email to