"Gennadiy Rozental" <[EMAIL PROTECTED]> writes: >> > P.S. Could you, please, clarify for me again what is the purpose of this >> > tag? How does it related to the fixes I made in trunk after branch is >> > created? >> >> The tag marks the last trunk revision that has been merged into the >> branch, so that when you do a merge to the branch you can always do >> >> cvs up -jmerged_to_RC_whatever -jHEAD >> >> Then when you switch back to the trunk (HEAD) you move the >> merged_to_RC_whatever tag to point at the HEAD again. > > Imagine I change the file abc.cpp. > > 1. I commited it im main trank: cvs commit abc.cpp > 2. I tag it with merged_to_RC_whatever tag (? this is not in a procedure > right now) > 3. I merge it to the release branch
No, you got 2 and 3 reversed, and you only do the tagging after switching back to the trunk. > Additionally if I need to change it again, before step 2 Iwill nedd to > untag it: cvs tag -d merged_to_RC_whatever, Absolutely not. > which is also is not in release procedure right now. > > Did I get it correct? I guess not. The procedures as written are absolutely perfect. Why second-guess them? -- Dave Abrahams Boost Consulting www.boost-consulting.com _______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost