Re: [Python-Dev] Dev FAQ update request for svnmerge

2010-08-17 Thread 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

Re: [Python-Dev] Dev FAQ update request for svnmerge

2010-08-17 Thread Steve Holden
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 u

Re: [Python-Dev] Dev FAQ update request for svnmerge

2010-08-16 Thread Senthil Kumaran
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 merge

[Python-Dev] Dev FAQ update request for svnmerge

2010-08-16 Thread Nick Coghlan
Could someone who knows how it is currently set up suggest a correction to the dev FAQ for svnmerge usage? The text at http://www.python.org/dev/faq/#how-do-i-merge-between-branches still describes the situation as it was before the trunk was closed to new checkins. Cheers, Nick. -- Nick Coghla