Beman gave me the advice below. When trying to svn merge libs/python I'm running into this error: svn: Access scheme mixtures not yet supported ('http://svn.boost.org/svn/boost/trunk/libs/python/test/enable_shared_from_thi...' and 'https://svn.boost.org/svn/boost/branches/release/libs/python/test') svn: Error reading spooled REPORT request response The full output is below. Fedora release 11 (Leonidas) % svn --version svn, version 1.6.4 (r38063) compiled Aug 7 2009, 03:42:39 The working copy was checked out fresh with this client. The merge command is OK for boost/python. Adding --force doesn't help for libs/python. Last night I locally tested after simply copying the boost/python and libs/python directories into a working copy of the release branch. That works fine, but there will be no merge info if I commit from the manually modified working copy. IIUC that will be a problem for future merges. What's the best way forward? What if I commit from the release working copy with the manual copies from the trunk, then manually edit svn:mergeinfo to tell it I have everything from trunk up to this point? -- Secondary question: should I do this at the top level (branches/release) or in the subdirectories (branches/release/boost/python, branches/release/libs/python)? Any advice is appreciated; I'm quite afraid of doing something bad to the merge info. (The svn documentation explicitly tells me not to merge in subdirectories in order to avoid pitfalls...) Ralf ----- Original Message ---- From: Beman Dawes <bdawes@acm.org> To: Ralf W. Grosse-Kunstleve <rwgk@yahoo.com> Sent: Monday, August 17, 2009 9:12:37 AM Subject: Re: [boost] [1.40.0] Unmerged changes delaying beta 1 I'd prefer these changes go in 1.40.0 if possible. Since they have been stable on trunk, and we are waiting a few more days anyhow for beta feedback, I don't see a lot of risk. So please merge, and then watch the release tests to make sure nothing breaks.

(I don't have any experience working with the release branch...)

The merge process is pretty simple. Assume you have a working copy of branches release at \boost\release: svn merge http://svn.boost.org/svn/boost/branches/release/boost/python \ http://svn.boost.org/svn/boost/trunk/boost/python \ \boost\release\boost\python svn merge http://svn.boost.org/svn/boost/branches/release/libs/python \ http://svn.boost.org/svn/boost/trunk/libs/python \ \boost\release\libs\python % svn merge --force http://svn.boost.org/svn/boost/branches/release/libs/python http://svn.boost.org/svn/boost/trunk/libs/python /net/firtree/raid1/rwgk/boost_release_merge_attempt/boost/libs/python --- Merging differences between repository URLs into '/net/firtree/raid1/rwgk/boost_release_merge_attempt/boost/libs/python': U /net/firtree/raid1/rwgk/boost_release_merge_attempt/boost/libs/python/test/andreas_beyer.cpp U /net/firtree/raid1/rwgk/boost_release_merge_attempt/boost/libs/python/test/stl_iterator.py U /net/firtree/raid1/rwgk/boost_release_merge_attempt/boost/libs/python/test/exec.cpp U /net/firtree/raid1/rwgk/boost_release_merge_attempt/boost/libs/python/test/slice.cpp U /net/firtree/raid1/rwgk/boost_release_merge_attempt/boost/libs/python/test/object.cpp U /net/firtree/raid1/rwgk/boost_release_merge_attempt/boost/libs/python/test/enum.py svn: Access scheme mixtures not yet supported ('http://svn.boost.org/svn/boost/trunk/libs/python/test/enable_shared_from_thi...' and 'https://svn.boost.org/svn/boost/branches/release/libs/python/test') svn: Error reading spooled REPORT request response