Boost logo

Boost :

Subject: Re: [boost] [uuid] status?
From: Andy Tompkins (atompkins_at_[hidden])
Date: 2010-01-13 00:34:19

> > 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
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->
> $ diff trunk/libs/libraries.htm release/libs/libraries.htm 306d305
> < <li>uuid - A universally unique
> identifier, from Andy Tompkins.</li>
> 593d591
> < <li>uuid - A universally unique
> identifier, from Andy Tompkins.</li>
> -- Marshall

Boost list run by bdawes at, gregod at, cpdaniel at, john at