Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 80 and 82 (spanning 2 versions)
Revision 80 as of 2006-11-10 19:48:35
Size: 9747
Comment: Add platform notes.
Revision 82 as of 2006-12-14 01:57:45
Size: 9315
Deletions are marked like this. Additions are marked like this.
Line 21: Line 21:
Line 114: Line 113:
= Implementation =
= Releases =
Line 117: Line 115:
= Installation =
Branch `` into `~/.bazaar/plugins/svn`:
 * [ 0.2] (works with Bazaar 0.13 and higher)
Line 120: Line 117:
$ mkdir -p ~/.bazaar/plugins
$ cd ~/.bazaar/plugins
$ bzr branch svn
= Requirements =
Line 142: Line 135:
= Platforms =

Currently tested only on Debian Sid and Ubuntu Dapper, Edgy and Debian Sid although all POSIX compliant systems with patched Subversion Python bindings should work.

Will likely not work on Windows yet, because os.path.separator isn't used consistently.
Line 151: Line 138:
= License =
GNU General Public License, v2 or later.
= Development =
Line 154: Line 140:
= Unit testing = == Branches ==

== Unit testing ==



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.

It is fully functional, but has only been tested on a few different Subversion branches (samba, wireshark, subversion, cups), so should be considered alpha.


Example branches

All created by simply running bzr branch ORIGINAL-URL.


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 vanilla working copied created with svn co works) and committed from.

  • Committing to Subversion from Bazaar.
  • Push Bazaar revisions to Subversion. These revisions will show up in Subversion as a commit with the pushed revision as one of the parents.
  • Follow branch copies. Revision history is not truncated when a branch was copied in Subversion.
  • Efficiently uses network bandwidth.
  • Recognizes file metadata (executable bits, symlinks).
  • 'import-svn' command with functionality similar to svn2bzr.
  • Ability to track merges done with SVK ( and write merges from SVK/Svn 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, ...

Future Enhancements

In the future, I also hope to support:

  • Renames. Initial work has been done to support this, but the number of corner cases is wide, so support for this
  • "True" push. This requires storing the Bazaar inventory and revision in Subversion revision properties.
    • Ideally, revision id aliases would have to be used so the revision id that is being 'overriden' can still exist. Once this is implemented, it would also be possible and make sense to store GPG signatures for commits in Subversion branches. This might require also storing 'bzr:inventory' and 'bzr:revision' properties in order to make sure the sha1's for a revision keep matching.
  • Proper read locking, which has basically been ignored for now.
  • Proper Windows support. Most of the code depends on '/' being the path separator at the moment.
  • Performance. 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 disk space and CPUs
    • 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

    • implement svn_ra_get_dir_revs() in Subversion to fetch the properties set on a specific directory all at once.
  • Creating native Subversion working copies. This would mostly be supported for completeness' sake, there are not a lot of advantages in supporting it.

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

Other features currently held back by Bazaars feature set:

Features held back by Subversion:



The plugin requires a couple of fixes to the Python bindings for Subversion that are only available in Subversion 1.5 (trunk). Debian/Ubuntu packages with these fixes backported are available in Ubuntu Edgy & Feisty and Debian Sid. You need the [ python-subversion] and [ libsvn0] packages.

A patch against Subversion 1.3.2 is also available at To build Subversions' Python bindings, run:

$ tar xvfj subversion-1.3.2.tar.bz2
$ cd subversion-1.3.2
$ ./ --release
$ ./configure
$ make
$ make check-swig-py
$ sudo make install install-swig-py

After ensuring these dependencies are met, you should be able to check out branches from Subversion using regular bzr commands.


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



Unit testing

Simply run 'bzr selftest svn'