Subject: Re: [boost] [release] How do you make a library update official?
From: John Maddock (john_at_[hidden])
Date: 2013-08-23 13:21:50
>> But it probably won't work in this case, as earlier changes won't be
>> marked as merged, so it will try to merge them as well.
>> The easiest thing to do is probably to specify the revisions to merge.
>> At the root of a release checkout:
>> svn merge -c85417 -c85418 "^/trunk/"
> A more selective way is to merge single changes at a time. I have
> attached the file I'm using for that for BGL (for Linux); it has
> directions for use, but you will need to customize it for your library.
> You will need to filter out old updates manually, but you get more control
> over what to merge and get a file of detailed changes (log messages from
> changes in the trunk) to help in writing the change log.
And just to say that if your goal is "make the release branch the same as
Trunk", then something like:
svn merge release/libs/yourlib_at_HEAD ../trunk/libs/yourlib_at_HEAD
svn merge release/boost/yourlib_at_HEAD ../trunk/boost/yourlib_at_HEAD
adjusting paths to release and trunk as required.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk