Subject: Re: [boost] [uuid] status?
From: Andy Tompkins (atompkins_at_[hidden])
Date: 2010-01-13 07:14:14
On Wed, 13 Jan 2010 11:12 +0300, "Vladimir Prus"
> 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
Thank you. I would have accidentally merged other changes besides the
ones I want for uuid. Her is the diff:
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
> svn copy https://svn.boost.org/svn/boost/trunk/libs/uuid
Thank you. This is what I was looking for (I looked up how these
are done in TortoiseSVN).
I believe that I have it all merged in correctly.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk