Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 167 and 254 (spanning 87 versions)
Revision 167 as of 2008-03-25 01:12:20
Size: 11064
Comment: Add 0.4.9
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:
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.
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.

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

Documentation
-------------

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

Support
-------
Ask bzr-svn related questions on the `Bazaar mailing list`_ or in the
#bzr IRC channel on Freenode.

.. Bazaar mailing list: http://lists.canonical.com/listinfo/bazaar/

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 <https://bugs.launchpad.net/bzr-svn/+bug/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 https://launchpad.net/products/bzr/+spec/shallow-checkouts

* Tracking copies.
  . Spec at https://launchpad.net/products/bzr/+spec/filecopies

* Showing SVN merges as merges in Bazaar.
  . Requires support for cherry-picking. Spec at https://launchpad.net/products/bzr/+spec/bzr-cpick-data

Releases
--------

* 0.4.9_ (works with Bazaar 1.3)
* 0.4.8_ (works with Bazaar 1.2)
* 0.4.7_ (works with Bazaar 1.0 and 1.1)
* 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.9: http://samba.org/~jelmer/bzr/bzr-svn-0.4.9.tar.gz
.. _0.4.8: http://samba.org/~jelmer/bzr/bzr-svn-0.4.8.tar.gz
.. _0.4.7: http://samba.org/~jelmer/bzr/bzr-svn-0.4.7.tar.gz
.. _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

Requirements
------------

SQLite
~~~~~~
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 and higher. 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 and 1.6 (trunk) contain the required fixes. To compile Subversion from trunk, run:

::

  $ svn export http://svn.collab.net/repos/svn/trunk svn
  $ ./autogen.sh --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 <http://people.samba.org/bzr/jelmer/subversion-1.3.2-pythonfixes.diff>`_
 - `Patch against Subversion 1.4.0 <http://samba.org/~metze/subversion-1.4.0-metze-python-bindings.patch>`_ (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 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


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`: http://subversion.tigris.org/issues/show_bug.cgi?id=3052


Windows Setup
^^^^^^^^^^^^^
An unofficial bzr-svn installer for Win32 as well as an unofficial, patched build of Python-Subversion for Windows can be found at http://d5190871.u44.websitesource.net/bzr/. This package can be used with the Python-based installer or the standalone installation of Bazaar.

Debian/Ubuntu
^^^^^^^^^^^^^
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.

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 http://svn.collab.net/repos/svn/trunk svn
  cd svn
  curl http://www.webdav.org/neon/neon-0.27.2.tar.gz | tar xz
  ln -sf neon-0.27.2 neon
  ./autogen.sh
  ./configure --without-apxs --with-ssl --prefix=$HOME/.bazaar/svn
  make install install-swig-py
  cd ..
  
  # Install the bzr_svn plugin
  mkdir ~/.bazaar ~/.bazaar/plugins
  cd ~/.bazaar/plugins
  rm -rf svn
  bzr checkout --lightweight \
    http://people.samba.org/bzr/jelmer/bzr-svn/stable svn
  # The following is a temporary patch - it will core-dump without it
  perl -p -i -e 's/(providers \+\= auth\.Subversion)/\#$1/g' svn/transport.py
  perl -p -i -e 's/(providers \+\= \[auth\.get)/\#$1/g' svn/transport.py

  # Setup your profile to recognize subversion 1.5
  echo >> ~/.profile << \EOF
  alias bzr="DYLD_LIBRARY_PATH=$HOME/.bazaar/svn/lib \
  PYTHONPATH=$HOME/.bazaar/svn/lib/svn-python \
  bzr"
  EOF
  . ~/.profile

  # Test bzr + svn w/ ssl
  cd /tmp
  rm -rf test
  bzr branch https://svn.collab.net/repos/svn/trunk test

To install on OS X Tiger follow Leopard instructions:
* If you updated XCode to 2.5, your libtool is broken. Installing libtool from macports solve this problem.

Packages
--------

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

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

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

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

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

Bugs
----
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
~~~~~~~~~~~~
To run the bzr-svn testsuite, 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.
Homepage: http://samba.org/~jelmer/bzr-svn/

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.

Homepage: http://samba.org/~jelmer/bzr-svn/