Hi Given the instructions at <http://svn.boost.org/trac/boost/wiki/ImprovingPractices#Mergingchangesfromdevelopmenttrunktoreleasebranch> I'm supposed to wait for an announcement to merge my trunk changes to the release branch. 1. How will this announcement be made? Would it be possible to get an email? 2. Is there an estimate when the announcement will be made? 3. How am I supposed to merge status/explicit-failures-markup.xml? Will I not somehow screw up the merge history of that file when I just merge the changes relevant for my library and ignore all the other pending changes? Thanks, -- Andreas Huber When replying by private email, please remove the words spam and trap from the address shown in the header.
A related question. I've got a fairly extensive set of changes that I would hope to be uploading to the trunk in the next 2 weeks or so. I will have tested the package on my own setup, but the changes are such that I would expect some surprizes on configurations I don't have access to. Can this be done anytime I find convenient? Or should I wait for some particular set of conditions to present themselves. Robert Ramey Andreas Huber wrote:
Hi
Given the instructions at
I'm supposed to wait for an announcement to merge my trunk changes to the release branch.
1. How will this announcement be made? Would it be possible to get an email? 2. Is there an estimate when the announcement will be made? 3. How am I supposed to merge status/explicit-failures-markup.xml? Will I not somehow screw up the merge history of that file when I just merge the changes relevant for my library and ignore all the other pending changes?
Thanks,
Robert Ramey wrote:
A related question. I've got a fairly extensive set of changes that I would hope to be uploading to the trunk in the next 2 weeks or so. I will have tested the package on my own setup, but the changes are such that I would expect some surprizes on configurations I don't have access to. Can this be done anytime I find convenient? Or should I wait for some particular set of conditions to present themselves.
The release manager (Beman) is away until Tuesday, but as I understand the state of things, he hopes to start moving libraries from Trunk to the release branch later this week. That means that (possibly) breaking changes at this stage in the release cycle are likely to be very unwelcome indeed :-( However, patches for the serialisation library's current regressions (http://beta.boost.org/development/tests/trunk/developer/issues_release_.html...) would be most welcome. Note also that some libraries that are unchanged in this release have serialization related failures: for example date-time http://tinyurl.com/3a6tl4. If your changes are the only way to address these issues, then they *might* be acceptable I guess, but otherwise I would suggest that you: * Copy your working copy (with the changes) to a branch if it's not on a branch already. * Concentrate on fixing regressions in Trunk. * Merge the branch to trunk after the release. But like I said, I'm not the release manager, so please consider this an unofficial view and contact Beman when he's back :-) HTH, John Maddock.
John Maddock wrote:
Robert Ramey wrote:
A related question. I've got a fairly extensive set of changes that I would hope to be uploading to the trunk in the next 2 weeks or so. I will have tested the package on my own setup, but the changes are such that I would expect some surprizes on configurations I don't have access to. Can this be done anytime I find convenient? Or should I wait for some particular set of conditions to present themselves.
The release manager (Beman) is away until Tuesday, but as I understand the state of things, he hopes to start moving libraries from Trunk to the release branch later this week. That means that (possibly) breaking changes at this stage in the release cycle are likely to be very unwelcome indeed :-(
However, patches for the serialisation library's current regressions (http://beta.boost.org/development/tests/trunk/developer/issues_release_.html...) would be most welcome. Note also that some libraries that are unchanged in this release have serialization related failures: for example date-time http://tinyurl.com/3a6tl4.
If your changes are the only way to address these issues, then they *might* be acceptable I guess, but otherwise I would suggest that you:
* Copy your working copy (with the changes) to a branch if it's not on a branch already. * Concentrate on fixing regressions in Trunk. * Merge the branch to trunk after the release.
But like I said, I'm not the release manager, so please consider this an unofficial view and contact Beman when he's back :-)
I agree 100% with everything John said. Thanks, John! --Beman
Andreas Huber wrote:
Given the instructions at
I'm supposed to wait for an announcement to merge my trunk changes to the release branch.
I don't think that page is up to date. I have no idea about the details but earlier this week Beman wrote:
I'll be traveling Thursday through Tuesday, and will start moving libraries to the release branch when I get back.
http://lists.boost.org/Archives/boost/2007/10/129169.php Daniel
Daniel James wrote:
Andreas Huber wrote:
Given the instructions at
I'm supposed to wait for an announcement to merge my trunk changes to the release branch.
I don't think that page is up to date. I have no idea about the details but earlier this week Beman wrote:
I'll be traveling Thursday through Tuesday, and will start moving libraries to the release branch when I get back.
I believe Beman will either do the merge himself or ask individual developers to do the merge. I do know that we want to avoid a 'merge free for all'. Jeff
Jeff Garland wrote:
Daniel James wrote:
Andreas Huber wrote:
Given the instructions at
I'm supposed to wait for an announcement to merge my trunk changes to the release branch. I don't think that page is up to date. I have no idea about the details but earlier this week Beman wrote:
I'll be traveling Thursday through Tuesday, and will start moving libraries to the release branch when I get back.
I believe Beman will either do the merge himself or ask individual developers to do the merge. I do know that we want to avoid a 'merge free for all'.
Exactly. I'll start checking later today, but I'm hoping that the vast majority of all libraries are in a good enough state that they can be moved to the release branch as a group. That will save endless trouble, both for release managers and individual developers. --Beman
Andreas Huber wrote:
Hi
Given the instructions at
I'm supposed to wait for an announcement to merge my trunk changes to the release branch.
1. How will this announcement be made? Would it be possible to get an email?
I'm going to do a trial merge sometime this week. If that works OK, it won't be necessary for each developer to do their own merging.
2. Is there an estimate when the announcement will be made? 3. How am I supposed to merge status/explicit-failures-markup.xml? Will I not somehow screw up the merge history of that file when I just merge the changes relevant for my library and ignore all the other pending changes?
I'm not sure of the details, but for now just concentrate on the trunk. Remember too that the "merge" from trunk to release is really an overwriting copy. SVN is actually doing a diff and a patch, with the trunk as the diff's "from" and the release branch as the diff's "to". Thus there is no possibility of a merge conflict. --Beman
participants (6)
-
Andreas Huber -
Beman Dawes -
Daniel James -
Jeff Garland -
John Maddock -
Robert Ramey