[Python-Dev] [Python-checkins] r84190 - python/branches/release31-maint/Doc/library/stdtypes.rst (original) (raw)

Tarek Ziadé ziade.tarek at gmail.com
Thu Aug 19 12:07:36 CEST 2010

On Thu, Aug 19, 2010 at 12:47 AM, Éric Araujo <merwok at netwok.org> wrote:

Let’s turn one error into an occasion for learning:

Log: Manually merge r84187 I was bad with numbers and actually ran svnmerge merge -r 81417, which did nothing. Since I have manually merged now, do I have to update the bookkeeping information manually? My understanding of the dev FAQ is: svnmerge block -r 84187. Is that right?

What I do is :

4 cd /the/right/branch/or/trunk $ svn ci -m 'comment' you get a revision number

$ cd py3k $ svn up $ svnmerge.py merge -r revision $ run the tests $ svn ci -F svn (there's a svn*.txt file generated by the svnmerge tool, don't do a manual comment)

Then I apply the same in all branches. Notice that if you merge something to py3k, the merge to the 3.x release branch is done with the revision number of the py3k commit, not the original one.

And I use "svnmerge block -r revision" for branches where the commit should not be applied, don't forget to do this. (same revision number cascading applies)

Let me know if you have any other issue

Cheers arek

Thank you.

Python-checkins mailing list Python-checkins at python.org http://mail.python.org/mailman/listinfo/python-checkins

-- Tarek Ziadé | http://ziade.org

More information about the Python-Dev mailing list