I notice that uuid is still not merged to the release branch. What is missing and can the merge be performed in next 24 hours? - Volodya
Hi, I have been waiting for the release managers to give the go ahead. Did I miss the message? I apologize if I did. I would not be able to merge today until late tonight (after 10:30pm). Should I merge? Regards, Andy Tompkins On Mon, 11 Jan 2010 11:50 +0300, "Vladimir Prus" <vladimir@codesourcery.com> wrote:
I notice that uuid is still not merged to the release branch. What is missing and can the merge be performed in next 24 hours?
- Volodya
Andy Tompkins wrote:
Hi,
I have been waiting for the release managers to give the go ahead. Did I miss the message? I apologize if I did. I would not be able to merge today until late tonight (after 10:30pm). Should I merge?
I believe this is what I saw: > I updated the documentation (added the markup - thank you, and > reorganized). I also marked all the tests on a few platforms as > expected failures (I hope I did it right). It looks good to me. And previously, Daniel said the only remaining item to check is documentation. So, it seems that everything is in order, and given that test results on trunk have a single failure, on sun-5.10, which is not a release platform, I'd say yes, please merge. - Volodya
On Jan 12, 2010, at 8:14 AM, Vladimir Prus wrote:
Andy Tompkins wrote:
Hi,
I have been waiting for the release managers to give the go ahead. Did I miss the message? I apologize if I did. I would not be able to merge today until late tonight (after 10:30pm). Should I merge?
I believe this is what I saw:
I updated the documentation (added the markup - thank you, and reorganized). I also marked all the tests on a few platforms as expected failures (I hope I did it right).
It looks good to me.
And previously, Daniel said the only remaining item to check is documentation.
So, it seems that everything is in order, and given that test results on trunk have a single failure, on sun-5.10, which is not a release platform, I'd say yes, please merge.
Andy -- when you merge, be sure to merge libs/libraries.htm libs/maintainers.txt as well, since they have the notices about the UUID library, and that you are the maintainer. ;-) here are the diffs, in case anyone is worried about exactly what has changed.... $ diff trunk/libs/maintainers.txt release/libs/maintainers.txt 92d91 < uuid Andy Tompkins <atompkins -at- fastmail.fm> $ diff trunk/libs/libraries.htm release/libs/libraries.htm 306d305 < <li><a href="uuid/index.html">uuid</a> - A universally unique identifier, from Andy Tompkins.</li> 593d591 < <li><a href="uuid/index.html">uuid</a> - A universally unique identifier, from Andy Tompkins.</li> -- Marshall
So, it seems that everything is in order, and given that test results on trunk have a single failure, on sun-5.10, which is not a release platform, I'd say yes, please merge.
Andy -- when you merge, be sure to merge libs/libraries.htm libs/maintainers.txt
I need some help. I have not checked in anything yet. I have been able to merge libs/libraries.htm, libs/maintainers.txt, and status/Janfile.v2. I do not know how to merge boost/uuid and libs/uuid since these directories are not in the release branch. Every time I try (with TortoiseSVN) it shows me all sorts of other changes that I don't want to merge. I could just copy the directories, but I assume this is not the correct way. I'm sure if the directories were there I would be fine.
as well, since they have the notices about the UUID library, and that you are the maintainer. ;-)
here are the diffs, in case anyone is worried about exactly what has changed....
$ diff trunk/libs/maintainers.txt release/libs/maintainers.txt 92d91 < uuid Andy Tompkins <atompkins -at- fastmail.fm>
$ diff trunk/libs/libraries.htm release/libs/libraries.htm 306d305 < <li><a href="uuid/index.html">uuid</a> - A universally unique identifier, from Andy Tompkins.</li> 593d591 < <li><a href="uuid/index.html">uuid</a> - A universally unique identifier, from Andy Tompkins.</li>
-- Marshall
Andy Tompkins wrote:
So, it seems that everything is in order, and given that test results on trunk have a single failure, on sun-5.10, which is not a release platform, I'd say yes, please merge.
Andy -- when you merge, be sure to merge libs/libraries.htm libs/maintainers.txt
I need some help. I have not checked in anything yet. I have been able to merge libs/libraries.htm, libs/maintainers.txt, and status/Janfile.v2.
For avoidance of doubt -- did you use examine changes in status/Jamfile.v2 and made sure that only uuid changes are gonna be committed?
I do not know how to merge boost/uuid and libs/uuid since these directories are not in the release branch. Every time I try (with TortoiseSVN) it shows me all sorts of other changes that I don't want to merge. I could just copy the directories, but I assume this is not the correct way. I'm sure if the directories were there I would be fine.
The correct way, I think, is: svn copy https://svn.boost.org/svn/boost/trunk/boost/uuid https://svn.boost.org/svn/boost/branches/release/boost/ svn copy https://svn.boost.org/svn/boost/trunk/libs/uuid https://svn.boost.org/svn/boost/branches/release/libs I recommend you do those commands on the command line, I have no idea how GUI clients might work. (It would be possible to first merge, on the top level, the revision where uuid was added to trunk, and then merge boost/uuid and libs/uuid separately. But, there's no particular reason to do so. The commands above should initialize mergeinfo just fine). - Volodya
On Wed, 13 Jan 2010 11:12 +0300, "Vladimir Prus" <vladimir@codesourcery.com> wrote:
Andy Tompkins wrote:
So, it seems that everything is in order, and given that test results on trunk have a single failure, on sun-5.10, which is not a release platform, I'd say yes, please merge.
Andy -- when you merge, be sure to merge libs/libraries.htm libs/maintainers.txt
I need some help. I have not checked in anything yet. I have been able to merge libs/libraries.htm, libs/maintainers.txt, and status/Janfile.v2.
For avoidance of doubt -- did you use examine changes in status/Jamfile.v2 and made sure that only uuid changes are gonna be committed?
Thank you. I would have accidentally merged other changes besides the ones I want for uuid. Her is the diff: --- C:/DOCUME~1/user/LOCALS~1/Temp/Jamfile.-revBASE.svn002.tmp.v2 Wed Jan 13 07:09:41 2010 +++ D:/Code/boost-release/status/Jamfile.v2 Wed Jan 13 06:59:25 2010 @@ -133,6 +133,7 @@ utility/enable_if/test # test-suite utility/enable_if utility/swap/test # test-suite utility/swap utility/test # test-suite utility + uuid/test # test-suite uuid variant/test # test-suite variant wave/test/build # test-suite wave xpressive/test # test-suite xpressive
I do not know how to merge boost/uuid and libs/uuid since these directories are not in the release branch. Every time I try (with TortoiseSVN) it shows me all sorts of other changes that I don't want to merge. I could just copy the directories, but I assume this is not the correct way. I'm sure if the directories were there I would be fine.
The correct way, I think, is:
svn copy https://svn.boost.org/svn/boost/trunk/boost/uuid https://svn.boost.org/svn/boost/branches/release/boost/
svn copy https://svn.boost.org/svn/boost/trunk/libs/uuid https://svn.boost.org/svn/boost/branches/release/libs
Thank you. This is what I was looking for (I looked up how these command are done in TortoiseSVN). I believe that I have it all merged in correctly. Regards, Andy Tompkins
2010/1/12 Vladimir Prus <vladimir@codesourcery.com>:
And previously, Daniel said the only remaining item to check is documentation.
Sorry if I wasn't clear. Andy, let me know when it's merged and I'll add it to the website.
So, it seems that everything is in order, and given that test results on trunk have a single failure, on sun-5.10, which is not a release platform, I'd say yes, please merge.
It looks like the remaining failures are all caused by dependencies, so they can't be fixed anyway. Daniel
On Tue, 12 Jan 2010 18:51 +0000, "Daniel James" <daniel_james@fmail.co.uk> wrote:
2010/1/12 Vladimir Prus <vladimir@codesourcery.com>:
And previously, Daniel said the only remaining item to check is documentation.
Sorry if I wasn't clear. Andy, let me know when it's merged and I'll add it to the website.
I have merged in my uuid library to release. I hope I did it correctly.
So, it seems that everything is in order, and given that test results on trunk have a single failure, on sun-5.10, which is not a release platform, I'd say yes, please merge.
It looks like the remaining failures are all caused by dependencies, so they can't be fixed anyway.
Right, I should have marked it as an expected failure. Do you want me to do this? If so, what is the process at this time. Mark it in trunk, wait to check regressions and then merge into release?
Daniel
Regards, Andy Tompkins
2010/1/13 Andy Tompkins <atompkins@fastmail.fm>:
I have merged in my uuid library to release. I hope I did it correctly.
It looks good. I'll try to sort things out over the next couple of days. You won't actually see the documentation on the website until after the release, but I'll make sure that it's integrated on a local copy.
Right, I should have marked it as an expected failure. Do you want me to do this? If so, what is the process at this time. Mark it in trunk, wait to check regressions and then merge into release?
Mark it in trunk, but don't merge until after the release. Daniel
participants (4)
-
Andy Tompkins -
Daniel James -
Marshall Clow -
Vladimir Prus