Re: [boost] [1.40.0] need svn merge advice

Subject: Re: [boost] [1.40.0] need svn merge advice
From: Steven Watanabe (watanabesj_at_[hidden])
Date: 2009-08-17 15:07:09

AMDG

Ralf W. Grosse-Kunstleve wrote:
> % 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_this.py' and 'https://svn.boost.org/svn/boost/branches/release/libs/python/test')
> svn: Error reading spooled REPORT request response
>   

Try using https for all URLs.

In Christ,
Steven Watanabe