Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 147 and 253 (spanning 106 versions)
Revision 147 as of 2008-01-17 00:57:37
Size: 11113
Editor: dysinger
Comment:
Revision 253 as of 2011-10-17 14:55:36
Size: 6668
Editor: jelmer
Comment: remove some obsolete data
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
## page was renamed from BzrForeignBranches/Subversion
Line 2: Line 3:


============
Bazaar support for Subversion branches, working trees and repositories
======================================================================


.. contents::
Line 6: Line 10:
============

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.

===========
Screenshots
===========

* http://samba.org/~jelmer/bzrk-svn.png
* http://samba.org/~jelmer/bzr/bzrsvn-merge.png
* http://samba.org/~jelmer/bzr/bzrsvn-renames.png
* http://samba.org/~jelmer/bzr/bzrsvn-commit.png
* http://samba.org/~jelmer/bzr/bzr-push-to-svn.png
* http://samba.org/~jelmer/bzr/bzr-push-samba.png
* http://samba.org/~jelmer/bzr/bzrsvn-samba3.png
* http://samba.org/~jelmer/bzr/bzrsvn-samba3a.png

========
Features
========
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 (http://svk.elixus.org/ or http://svk.bestpractical.com) 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:

--------
------------

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.

.. _Bazaar: http://bazaar-vcs.org/
.. _Subversion: http://subversion.tigris.org/

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 also provides a Bazaar subcommand ("bzr svn-import") for converting
complete Subversion repositories to Bazaar repositories.
Line 65: Line 28:
* 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 http://people.samba.org/bzr/jelmer/bzr-svn/nestedtrees. `#82863 <https://bugs.launchpad.net/bzr-svn/+bug/82863>`_

* tags

===========
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 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 http://people.samba.org/bzr/jelmer/bzr-svn/replay
* The function that obtains logs in Subversion leaks memory. This is a known issue.

=============
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.

- Integrates well with Bazaar.

- Track Bazaar merges in Subversion.

- 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_.

.. _svn2bzr: http://bazaar-vcs.org/svn2bzr

- Ability to track merges done with SVK_ and write merges from SVK/Subversion
  branches in a format understandable by SVK.

.. _SVK: http://svk.elixus.org/

- Writes svn:mergeinfo property used by Subversion 1.5.

- 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.
Line 84: Line 77:
============= -------------
Line 87: Line 80:
`Bazaar Documentation Overview`_ for documentation on that. `Bazaar Documentation Overview`_ and the `Bazaar User Guide`_ for documentation on that.
Line 90: Line 83:

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

==========
Properties
==========

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 User Guide: http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#bzr-svn

Some bzr-svn specific issues are answered by the FAQ included with bzr-svn.

Support
-------
Please use the `regular Bazaar channels for support`_ for questions about bzr-svn.

.. _regular Bazaar channels for support: BzrSupport

Limitations
-----------

Unsupported Subversion File Properties
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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
Line 109: Line 106:
* 'svn:mime-type'

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

* 'svn:keywords'. Requires keywords support in Bazaar. Spec at https://launchpad.net/products/bzr/+spec/bzr-keyword-expansion. `#81463 <https://bugs.launchpad.net/bzr-svn/+bug/81463>`_
- 'svn:mime-type'

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

- 'svn:keywords'. Requires keywords support in Bazaar. Spec at https://launchpad.net/products/bzr/+spec/bzr-keyword-expansion. `#81463 <https://bugs.launchpad.net/bzr-svn/+bug/81463>`_
Line 117: Line 114:
* 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 https://launchpad.net/products/bzr/+spec/shallow-checkouts

* Tracking copies.
- 'svn:externals'. Externals should be mapped to Bazaar 'by-reference'
  nested branches and the other way around. This can't be implemented
  until Bazaars nested branch support lands. The current work-in-progress also
  needs support for pointing at the tip of a branch rather than at a
  specific revision.

- Tracking copies.
Line 123: Line 123:
* Showing SVN merges as merges in Bazaar. - Showing SVN merges as merges in Bazaar.
Line 126: Line 126:
======== Bazaar Commands
~~~~~~~~~~~~~~~

All Bazaar commands should work fine with Subversion branches or should properly inform you that they do not. If you find any commands that don't work, please file a bug.
Line 128: Line 132:
========

* 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: http://samba.org/~jelmer/bzr/bzr-svn-0.4.6.tar.gz
.. _0.4.5: http://samba.org/~jelmer/bzr/bzr-svn-0.4.5.tar.gz
.. _0.4.4: http://samba.org/~jelmer/bzr/bzr-svn-0.4.4.tar.gz
.. _0.4.3: http://samba.org/~jelmer/bzr/bzr-svn-0.4.3.tar.gz
.. _0.4.2: http://samba.org/~jelmer/bzr/bzr-svn-0.4.2.tar.gz
.. _0.4.1: http://samba.org/~jelmer/bzr/bzr-svn-0.4.1.tar.gz
.. _0.4.0: http://samba.org/~jelmer/bzr/bzr-svn-0.4.0.tar.gz
.. _0.3.5: http://samba.org/~jelmer/bzr/bzr-svn-0.3.5.tar.gz
.. _0.3.4: http://samba.org/~jelmer/bzr/bzr-svn-0.3.4.tar.gz
.. _0.3.3: http://samba.org/~jelmer/bzr/bzr-svn-0.3.3.tar.gz
.. _0.3.2: http://samba.org/~jelmer/bzr/bzr-svn-0.3.2.tar.gz
.. _0.3.1: http://samba.org/~jelmer/bzr/bzr-svn-0.3.1.tar.gz
.. _0.3: http://samba.org/~jelmer/bzr/bzr-svn-0.3.tar.gz
.. _0.2: http://samba.org/~jelmer/bzr/bzr-svn-0.2.tar.gz
.. _0.1: http://samba.org/~jelmer/bzr/bzr-svn-0.1.tar.gz

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

.. _Jelmer's Debian repository: http://samba.org/~jelmer/debian/

This repository is signed with Jelmers' GPG key (1EEF5276).

Ubuntu hardy and Debian sid already contain the latest release.

============
--------

See https://launchpad.net/bzr-svn/+download for a current list of releases.
Line 172: Line 137:
============

The plugin requires a couple of fixes to the Python bindings for Subversion that are only available in Subversion 1.5 (trunk).

A patch against Subversion 1.4.3 is also available at http://samba.org/~metze/subversion-1.4.0-metze-python-bindings.patch. To build a fixed version of Subversion's Python bindings using this patch, run:

::

  $ wget http://subversion.tigris.org/downloads/subversion-1.4.3.tar.bz2
  $ tar xvfj subversion-1.4.3.tar.bz2
  $ cd subversion-1.4.3
  $ patch -p1 < subversion-1.4.0-metze-python-bindings.patch
  $ ./autogen.sh --release
  $ ./configure
  $ make
  $ make check-swig-py
  $ sudo make install install-swig-py

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.

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

An `older patch for Subversion 1.3.2 <http://people.samba.org/bzr/jelmer/subversion-1.3.2-pythonfixes.diff>`_ is available

Python-SVN bindings for Win32 can be found at http://www.scio.com.mx/gui/svn_python-1.4.3.win32.exe. 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.

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

::

  sudo easy_install -U paramiko pycrypto bzr

  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-apache --without-apxs --with-ssl --prefix=/tmp \
    --libdir=$HOME/.bazaar/lib
  make extraclean-swig
  ./autogen.sh --release
  make install-swig-py
  cd ..

  echo >> $HOME/.profile << \EOF
  alias b='DYLD_LIBRARY_PATH=$HOME/.bazaar/lib PYTHONPATH=$HOME/.bazaar/lib/svn-python bzr'
  EOF
  source ~/.profile

  mkdir ~/.bazaar ~/.bazaar/plugins
  cd ~/.bazaar/plugins
  rm -rf svn
  b branch http://people.samba.org/bzr/jelmer/bzr-svn/stable svn

  # Try it out
  cd /tmp
  b branch http://macromates.com/svn/Bundles/trunk textmate-bundles


========
------------

Bazaar
~~~~~~

You will need a recent version of Bazaar. bzr-svn
will warn if the Bazaar release used is too old or too new.

Subvertpy
~~~~~~~~~

You need the `Subvertpy`_ Python module, which provides Python bindings
for the Subversion library.

.. _Subvertpy: http://samba.org/~jelmer/subvertpy/

Installation
------------

Simply place this directory in ~/.bazaar/plugins and you should be able
to check out branches from Subversion using bzr. Make sure the directory
name is 'svn'.
Line 235: Line 161:
========

Debian/Ubuntu packages with the required fixes backported are available in Ubuntu since Edgy and Debian since Etch. You need the `python-subversion <http://packages.ubuntu.com/edgy/python/python-subversion>`_ and `libsvn0 <http://packages.ubuntu.com/edgy/libs/libsvn0>`_ packages. bzr-svn itself is also packaged.
--------

Instead of installing the plugin yourself, you can also install a prepackaged
version of it for your platform.

Windows Setup
~~~~~~~~~~~~~
The standard `Windows installers for Bazaar`_ include bzr-svn.

.. _Windows installers for Bazaar: https://launchpad.net/bzr/+download

Debian/Ubuntu GNU/Linux
~~~~~~~~~~~~~~~~~~~~~~~
Debian/Ubuntu packages are available from Debian experimental/sid and the Bazaar PPA.

Ubuntu's in-development release usually also contain the latest release.

Debian's main repositories also have bzr-svn since at least the lenny release.

OpenSuse Linux
~~~~~~~~~~~~~~
Line 241: Line 184:
Installation instructions for Fedora/RedHat are on https://planning.acm.org/hq/documentation/version-control/installing-bzr-svn

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 https://launchpad.net/bzr-gentoo-overlay/.

====
Gentoo Linux
~~~~~~~~~~~~
An unofficial Gentoo overlay containing a bzr-svn ebuild are hosted on launchpad at https://launchpad.net/bzr-gentoo-overlay/.

Mac OS X
~~~~~~~~

bzr-svn is included in the MacOSXBundle_.

bzr-svn is now also available in MacPorts, and can be installed with: ``$ sudo port install bzr-svn``
Line 247: Line 196:
====
Please file bug reports in launchpad. The product URL for bzr-svn is https://launchpad.net/bzr-svn/.

===========
Development
===========

--------
Branches
--------
* http://people.samba.org/bzr/jelmer/bzr-svn/0.4 (stable release series)
* http://people.samba.org/bzr/jelmer/bzr-svn/0.3 (old stable release series)
* http://people.samba.org/bzr/jelmer/bzr-svn/trunk (bleeding edge, may break existing imports every now and then)

------------
Unit testing
------------
Simply run 'bzr selftest svn'

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

Please file bug reports in launchpad. The product URL for bzr-svn is
https://launchpad.net/bzr-svn/.

Upgrading
~~~~~~~~~

If you used ancient versions of bzr-svn that used a different mapping mechanism (< 0.4) you may want to use the ``rebase-foreign`` command that is available in the `bzr-rewrite`_ plugin.

.. _bzr-rewrite: http://bazaar-vcs.org/Rewrite


..
 vim: ft=rest

Bazaar support for Subversion branches, working trees and repositories

Introduction

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.

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 also provides a Bazaar subcommand ("bzr svn-import") for converting complete Subversion repositories to Bazaar repositories.

Features

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.

  • Integrates well with Bazaar.

  • Track Bazaar merges in Subversion.

  • 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 and write merges from SVK/Subversion branches in a format understandable by SVK.
  • Writes svn:mergeinfo property used by Subversion 1.5.
  • 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.

Documentation

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

Some bzr-svn specific issues are answered by the FAQ included with bzr-svn.

Support

Please use the regular Bazaar channels for support for questions about bzr-svn.

Limitations

Unsupported Subversion File Properties

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 https://launchpad.net/products/bzr/+spec/new-ignore-rules
  • 'svn:mime-type'
  • 'svn:eol-style'. Requires eol support in Bazaar.
  • 'svn:keywords'. Requires keywords support in Bazaar. Spec at https://launchpad.net/products/bzr/+spec/bzr-keyword-expansion. #81463

Other features currently held back by Bazaars feature set:

Bazaar Commands

All Bazaar commands should work fine with Subversion branches or should properly inform you that they do not. If you find any commands that don't work, please file a bug.

Releases

See https://launchpad.net/bzr-svn/+download for a current list of releases.

Requirements

Bazaar

You will need a recent version of Bazaar. bzr-svn will warn if the Bazaar release used is too old or too new.

Subvertpy

You need the Subvertpy Python module, which provides Python bindings for the Subversion library.

Installation

Simply place this directory in ~/.bazaar/plugins and you should be able to check out branches from Subversion using bzr. Make sure the directory name is 'svn'.

Packages

Instead of installing the plugin yourself, you can also install a prepackaged version of it for your platform.

Windows Setup

The standard Windows installers for Bazaar include bzr-svn.

Debian/Ubuntu GNU/Linux

Debian/Ubuntu packages are available from Debian experimental/sid and the Bazaar PPA.

Ubuntu's in-development release usually also contain the latest release.

Debian's main repositories also have bzr-svn since at least the lenny release.

OpenSuse Linux

OpenSuse packages created by Michael Wolf are available from http://download.opensuse.org/repositories/home:/maw:/bzr/

Gentoo Linux

An unofficial Gentoo overlay containing a bzr-svn ebuild are hosted on launchpad at https://launchpad.net/bzr-gentoo-overlay/.

Mac OS X

bzr-svn is included in the MacOSXBundle.

bzr-svn is now also available in MacPorts, and can be installed with: $ sudo port install bzr-svn

Bugs

Please file bug reports in launchpad. The product URL for bzr-svn is https://launchpad.net/bzr-svn/.

Upgrading

If you used ancient versions of bzr-svn that used a different mapping mechanism (< 0.4) you may want to use the rebase-foreign command that is available in the bzr-rewrite plugin.