Subversion branch support for Bazaar

How, exactly, can I make bzr-svn work on OS X Leopard

Asked by Tim Dysinger on 2008-01-16

OS X Leopard comes with SVN 1.4.4 and Python 2.5 and SVN SWIG for Python 2.5. This won't work for bzr-svn.

I tried the 1.4.x SVN branch w/ patch and the 1.5 trunk SVN branch and compiled it to /usr/local. None of it works for me. I have banged my head against this to the point of bloody and helpless.

# Install Bazaar
sudo easy_install -U paramiko pycrypto bzr

# 1.4 subversion & patch
cd /tmp
rm -rf subversion*
curl -O http://subversion.tigris.org/downloads/subversion-1.4.6.tar.bz2
tar xvfj subversion-1.4.6.tar.bz2
cd subversion-1.4.6
curl http://samba.org/~metze/subversion-1.4.0-metze-python-bindings.patch \
  | patch -p1
./configure \
  --without-berkeley-db \
  --without-apache \
  --without-apxs \
  --without-neon \
  --with-ssl \
  --prefix=/tmp \
  --libdir=/usr/local/lib
make
make check
sudo make install
make swig-py
make check-swig-py
sudo make install-swig-py
cd ..

export LD_LIBRARY_PATH=$HOME/lib:/usr/local/lib
export PYTHONPATH=/usr/local/lib/svn-python

# Check it ---
python -c "import svn.delta; print svn.delta.__file__"

#
# Boink! This rest of this script is broken and doesn't work
#

python -c "from svn.delta import svn_delta_invoke_txdelta_window_handler"
# Errors out and makes the rest of this script pointless

# Install the bzr_svn plugin
# ( http://bazaar-vcs.org/BzrForeignBranches/Subversion )
mkdir ~/.bazaar ~/.bazaar/plugins
cd ~/.bazaar/plugins
rm -rf svn
bzr branch http://people.samba.org/bzr/jelmer/bzr-svn/stable svn

# Try it
bzr branch http://macromates.com/svn/Bundles/trunk/ textmate-bundles

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Subversion Plugin Edit question
Assignee:
No assignee Edit question
Solved by:
Tim Dysinger
Solved:
2008-01-18
Last query:
2008-01-18
Last reply:
Tim Dysinger (tim-dysinger) said : #1

I figured this out and posted the script to the bzr-svn home page and my blog.

http://dysinger.net

http://bazaar-vcs.org/BzrForeignBranches/Subversion

Since bzr-svn 0.4.13, the Subversion issues have been addressed. There is no need to modify the Subversion bundled with Mac OS X 10.5, and Keychain authentication will also work if it is compiled in the Subversion build against which bzr-svn is linked.