[Python-Dev] Dev FAQ update request for svnmerge (original) (raw)

Senthil Kumaran orsenthil at gmail.com
Tue Aug 17 07:45:04 CEST 2010

On Tue, Aug 17, 2010 at 03:08:31PM +1000, Nick Coghlan wrote:

Could someone who knows how it is currently set up suggest a correction to the dev FAQ for svnmerge usage?

2.26 How do I merge between branches?

All development occurs under the py3k branch and bug fixes are expected to be merged into two additional branches, which are release2x-maint and release3x-maint.

Assuming a change is committed into py3k as revision 0001, you merge into the release2x-maint by doing:

In the release2x-maint branch checkout.

svnmerge.py merge -r 0001 svn commit -F svnmerge-commit-message.txt # r0002

In a release3x-maint checkout.

svnmerge.py merge -r 0001 svn commit -F svnmerge-commit-message.txt # r0003

Optional

In rare situations where you want to backport a security fix or a documentation fix into release26-maint branch:

#In the release26-maint checkout.

svnmerge merge -S /python/branches/release27-maint -r0002 svn commit -F svnmerge-commit-message.txt # r0004

-- Senthil

It's multiple choice time...

What is FORTRAN?

a: Between thre and fiv tran.
b: What two computers engage in before they interface.
c: Ridiculous.

More information about the Python-Dev mailing list