[Python-Dev] Dev FAQ update request for svnmerge

[Terry Reedy]

On 8/17/2010 1:45 AM, Senthil Kumaran wrote:
> 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

That can and now should specifically be release27_maint as 26 is now 
effectively closed to routine bug fixes.

> 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:

I think the only doc fix would be part of a security fix, so no need to 
mention separately I think.
>
> #In the release26-maint checkout.
>
> svnmerge merge -S /python/branches/release27-maint -r0002
> svn commit -F svnmerge-commit-message.txt  # r0004
>
>
>


-- 
Terry Jan Reedy