On Fri, 23 Aug 2013, Daniel James wrote:
On Fri, 23 Aug 2013, at 01:16 PM, Vicente J. Botet Escriba wrote:
Move to the release directory and do
cd boost/your_lib svn merge "^trunk/boost/your_lib"
That should be:
svn merge "^/trunk/boost/your_lib"
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. -- Jeremiah Willcock