|
Boost : |
Subject: Re: [boost] [release] How do you make a library update official?
From: Daryle Walker (darylew_at_[hidden])
Date: 2013-08-24 04:43:38
> From: ramey_at_[hidden]
> Date: Fri, 23 Aug 2013 11:45:55 -0800
>
> I follow this procedure
>
> https://svn.boost.org/trac/boost/wiki/ImprovingPractices#Mergingchangesfromdevelopmenttrunktoreleasebranch
>
> for those directories which correspond to the library which I personally
> maintain. It's kind of a pain - but
> I don't do it very often.
I kind-of followed that page; when I tried without any revision numbers, the
merge-test reported a tree conflict in an unrelated library while my changed
files weren't reported. I did a merge-test again, with revision numbers
([85417], update test code for C++11's numeric_limits; [85418], fix narrowing
conversion error in less-than; and [85434], correct for MSVC not accepting
"not" for "!".) and got the expected results, except for a maybe-conflict for
"libs/rational/test/rational_test.cpp", since multiple change-sets affect that
file. (The other file for these changes is "boost/rational.hpp", which is
affected in one change-set.)
I performed an actual merge, and that conflict-warning never happened. A
diff from the pre-changed archive had the expected results, so I committed the
merge on the release branch as change-set [85441]. Since it's my first time
touching the release branch, can some expert check that I didn't accidentally
fry some meta-data (or some other damage)?
Daryle W.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk