Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 150 and 254 (spanning 104 versions)
Revision 150 as of 2008-01-19 13:34:25
Size: 11364
Comment: key details are also on repository site
Revision 254 as of 2013-05-24 18:21:05
Size: 344
Editor: jelmer
Comment: Just provide link to homepage, now restructuredtext support on the wiki is broken
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
#FORMAT rst = Bazaar support for Subversion branches, working trees and repositories =
Line 3: Line 3:
bzr-svn is a plugin that allows Bazaar direct access to Subversion
repositories. It allows most bzr commands to work directly against Subversion
repositories, as if you were using bzr with a native bzr repository.
Line 6: Line 7:
This plugin allows bzr direct access to Subversion repositories. This allows ``bzr branch``, ``bzr push``, ``bzr pull``, and ``bzr co`` to work directly against Subversion repositories.

The plugin can at the moment be used to commit to, pull from, merge from, push to and view logs of Subversion branches from Bazaar.

The following features are currently present:

* Connecting to remote Subversion repositories over all protocols supported by Subversion itself (at present: svn://, svn+ssh://, http:// (webdav), file://) as well as dump files. Checkouts, lightweight checkouts and branching works.

* Track Bazaar merges in Subversion. Merged revisions show up as ghosts.

* Subversion working copies. Can be modified, queried (``bzr status`` on a svn- native working copy created with ``svn co`` works) and committed from.

* Committing to Subversion from Bazaar.

* Push Bazaar revisions to Subversion.

* Follow branch copies. Revision history is not truncated when a branch was copied in Subversion.

* Efficiently uses network bandwidth.

* Recognizes file metadata (executable bits, symbolic links).

* 'svn-import' command with functionality similar to svn2bzr_.

* Ability to track merges done with SVK ( or and write merges from SVK/Subversion branches in a format understandable by SVK.

* Generates consistent file ids and revision ids. Two branches made using this plugin of the same Subversion branch will result in *exactly* the same Bazaar branch.

* Handles complex operations in Subversion: committing to two branches at once, upgrading directories to branches, copies from early revisions, ...

* Tested on Linux, Windows and Mac OS X.

Future Enhancements
In the future, I also hope to support:


* Turning delete + copy in Subversion into renames in bzr. Note that bzr revisions with renames can be pushed and pull just fine without losing information about renames because extra metadata is stored in the svn repository for that purpose.

* 'svn:externals'. Externals should be mapped to Bazaar 'by-reference' nested branches and the other way around. Work on progress in `#82863 <>`_

* tags


Network-wise (both bandwidth and roundtrips), the plugin is in good shape. However, it is currently quite CPU-intensive for no good reason and I hope to make a couple of improvements in that area.

* More efficient use of CPU
* Override implementation of get_revision_delta(). Will speed up 'bzr log -v'
* use svn_ra_replay() on systems that have Subversion 1.4. Saves a couple of roundtrips when fetching history. Initial work in branch at
* The function that obtains logs in Subversion leaks memory. This is a known issue.


bzr-svn can be used through the regular Bazaar user interface, see the
`Bazaar Documentation Overview`_ for documentation on that.

.. _Bazaar Documentation Overview: Documentation

Some bzr-svn specific issues are answered by the FAQ_.

.. _FAQ: BzrForeignBranches/Subversion/FAQ

The way Bazaar metadata is stored in Subversion and the other way around is specified in the `mapping specification`_.

.. _mapping specification: BzrForeignBranches/Subversion/mapping


Some Subversion properties can currently not be represented in Bazaar and are therefore ignored for the time being:

* 'svn:ignore' is not imported. There should be a `Repository.get_ignores(revid)` call in
  Bazaar rather than a magic '.bzrignore' file.
  Spec at

* 'svn:mime-type'

* 'svn:eol-style'. Requires eol support in Bazaar.

* 'svn:keywords'. Requires keywords support in Bazaar. Spec at `#81463 <>`_

Other features currently held back by Bazaars feature set:

* Horizon revision history. Most of the existing Subversion repositories are quite large and it would therefore be nice to be able to limit the amount of history that needs to be retrieved during checkouts. Subversion supports horizon history fine.
  . Spec at

* Tracking copies.
  . Spec at

* Showing SVN merges as merges in Bazaar.
  . Requires support for cherry-picking. Spec at


* 0.4.6_ (works with Bazaar 1.0 and 1.1)
* 0.4.5_ (works with Bazaar 1.0 and higher)
* 0.4.4_ (works with Bazaar 0.92 and higher)
* 0.4.3_ (works with Bazaar 0.90 and higher)
* 0.4.2_ (works with Bazaar 0.90 and higher)
* 0.4.1_ (works with Bazaar 0.90 and higher)
* 0.4.0_ (works with Bazaar 0.19 and higher)
* 0.3.5_ (works with Bazaar 0.18 and higher)
* 0.3.4_ (works with Bazaar 0.17 and higher)
* 0.3.3_ (works with Bazaar 0.16 and higher)
* 0.3.2_ (works with Bazaar 0.15 and higher)
* 0.3.1_ (works with Bazaar 0.14 and higher)
* 0.3_ (works with Bazaar 0.14 and higher)
* 0.2_ (works with Bazaar 0.13 and higher)
* 0.1_ (works with Bazaar 0.8 and higher)

.. _0.4.6:
.. _0.4.5:
.. _0.4.4:
.. _0.4.3:
.. _0.4.2:
.. _0.4.1:
.. _0.4.0:
.. _0.3.5:
.. _0.3.4:
.. _0.3.3:
.. _0.3.2:
.. _0.3.1:
.. _0.3:
.. _0.2:
.. _0.1:


If you are using Python 2.4, you will need to have the pysqlite module installed. Python 2.5 and higher have sqlite support built in.

Python-Subversion >= 1.5
The plugin requires a couple of fixes to the Python bindings for Subversion that are only available in Subversion 1.5 (trunk). Subversion 1.5 has not been released yet, but packages with the appropriate patches applied to older versions are available for some platforms.

Building from source
Subversion 1.5 (trunk) contains the required fixes. To compile Subversion trunk, run:


  $ svn export svn
  $ ./ --release
  $ ./configure
  $ make
  $ make check-swig-py
  $ sudo make install install-swig-py

Patches for Subversion 1.3.x and 1.4.x are also available:

 - `Patch against Subversion 1.3.2 <>`_
 - `Patch against Subversion 1.4.0 <>`_ (tested with Subversion 1.4.0-1.4.6)

To build a fixed version of Subversion's Python bindings using one of these patches, run:


  $ wget
  $ tar xvfj subversion-1.4.3.tar.bz2
  $ cd subversion-1.4.3
  $ patch -p1 < subversion-1.4.0-metze-python-bindings.patch
  $ ./ --release
  $ ./configure
  $ make
  $ make check-swig-py
  $ sudo make install install-swig-py

Please note that the patches against Subversion 1.3.2 and 1.4.0 don't include the `fix for a major memory leak in python-subversion`_.

.. _`fix for a major memory leak in python-subversion`:

Windows Setup
Python-SVN bindings for Win32 can be found at These bindings appear to be dependent on msvcr80.dll (included in .Net 2.0). Windows is supported as of 0.4.0. You will also need to use the Python-based installer of Bazaar rather than the standalone one.

Debian/Ubuntu packages with the required fixes backported are available in Ubuntu since Edgy and Debian since Etch. You need the `python-subversion <>`_ and `libsvn0 <>`_ packages.

Mac OS X

To install on OS X Leopard do something like the following:


  # Install the latest stable Bazaar (if you didn't already)
  sudo easy_install -U paramiko pycrypto bzr
  # Compile Subversion 1.5 (for better python support)
  cd /tmp
  rm -rf svn
  svn export svn
  cd svn
  curl | tar xz
  ln -sf neon-0.27.2 neon
  ./ --release
  ./configure --without-apxs --without-apache --with-ssl
  sudo make install
  make swig-py
  sudo make install-swig-py
  cd ..
  # Setup bzr to recognize the new subversion bindings
  echo >> $HOME/.profile << \EOF
  export PYTHONPATH=/usr/local/lib/svn-python
  export PATH=/usr/local/bin:$PATH
  . ~/.profile
  # Install the bzr_svn plugin
  mkdir ~/.bazaar ~/.bazaar/plugins
  cd ~/.bazaar/plugins
  rm -rf svn
  bzr checkout --lightweight \ svn
  # Try it out
  cd /tmp
  bzr checkout --lightweight \ textmate-bundles


Debian/Ubuntu packages are available from `Jelmer's Debian repository`_.

.. _Jelmer's Debian repository:

Ubuntu hardy and Debian sid usually also contain the latest release.

OpenSuse packages created by Michael Wolf are available from

Installation instructions for Fedora/RedHat are on

An unofficial Gentoo overlay containing the patches for Subversion versions 1.3 and 1.4, plus a bzr-svn ebuild are hosted on launchpad at

Please file bug reports in launchpad. The product URL for bzr-svn is


* (stable release series)
* (old stable release series)
* (bleeding edge, may break existing imports every now and then)

Unit testing
Simply run 'bzr selftest svn'

bzr-svn was written by JelmerVernooij_ with the help from various other people. See the AUTHORS file in the source distribution for a list.

Bazaar support for Subversion branches, working trees and repositories

bzr-svn is a plugin that allows Bazaar direct access to Subversion repositories. It allows most bzr commands to work directly against Subversion repositories, as if you were using bzr with a native bzr repository.