Benjamin Peterson schrieb:
> I know that doing merges is rather painful because of the Misc/NEWS
> files. Would it be possible to have the NEWS log generated from commit
> messages? I was thinking something like this in a message:

No, it's not painful ;) The NEWS files doesn't get merged from trunk to 3.0.

$ svnmerge.py merge
$ svn revert Misc/NEWS

resolve conflicts, compile, test

$ svn ci -F svn....

Christian

_______________________________________________
Python-Dev mailing list
Python-Dev@python.org
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