Re: [Boost-build] CVS: boost/tools/build/v1 tru64cxx65-tools.jam,1.14,1.14.2.1

From: Markus Schöpflin (markus.schoepflin_at_[hidden])
Date: 2004-10-26 06:44:21

Vladimir Prus wrote:

> On Tuesday 26 October 2004 14:06, Markus Schöpflin wrote:
> 
>>Update of /cvsroot/boost/boost/tools/build/v1
>>In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30025
>>
>>Modified Files:
>> Tag: RC_1_32_0
>> tru64cxx65-tools.jam
>>Log Message:
>>Changed template instantiation mode from "-tlocal" to "-implicit_local".
> 
> 
> Hi Markus,
> I believe the standard procedure is committing fixes to the trunk, then 
> merging to to branch, not the other way around. Merge to branch can be done 
> with
> 
> cvs up -j merged_to_RC_1_32_0 -j HEAD
> 
> and you're supposed to move merged_to_RC after the merge, as documented at:
> http://boost.org/more/release_procedures.htm#Developers

Yes, I remembered this just after the checkin. :-( As a remedy I merged to 
the main trunk via cvs up -j RC_1_32_0 after the checking and tagged the 
main trunk accordingly.

The reason why I ended up in the release branch was that I tested the 
change there because I wanted to fix the problem in the clean release 
candiate and not in the main branch where possibly other changes would 
affect me.

This seemed quite natural to me and after reading beforementioned procedure 
I was quite surprised that it was the other way round. After the branch for 
release has occured, the main branch is no longer expected to be stable, or 
is it?

Markus