Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 1 and 199 (spanning 198 versions)
Revision 1 as of 2005-11-22 01:48:01
Size: 789
Comment: Add page about support for foreign Subversion branches.
Revision 199 as of 2008-10-30 12:48:49
Size: 10538
Comment: formatting
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
http://samba.org/~jelmer/bzr/svn/ contains the beginnings a plugin for bzr that adds support for foreign Subversion repositories. Running 'bzr log' on a remote repository works now, as well as various other simple things, such as ["bzrk"] ([http://samba.org/~jelmer/bzrk-svn.png screenshot]).

In order to run this plugin, you need support for BzrForeignBranches.

== TODO ==

 * Finish SvnRevisionTree so data can be viewed correctly
 * Implement fetch/pull (needs to be fixed in core first)
 * Finish LocalSvnBranch. uuid_from_path currently segfaults. SvnWorkingTree needs to be finished

 * Generate Inventories from Revisions rather then the other way around (as is default in bzr). This should increase speed a lot. 'svn ls' is used at the moment, and is very, very slow.
#FORMAT rst
Bazaar support for Subversion branches, working trees and repositories
======================================================================

.. contents::

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.

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


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

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

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: http://samba.org/~jelmer/bzr-svn/FAQ.html

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

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

Bazaar Commands
~~~~~~~~~~~~~~~

Most Bazaar commands should work fine with Subversion branches. The following commands at the moment do not:

 - bzr push --create-prefix

Releases
--------

* `0.4.13`_ (works with Bazaar 1.6 and 1.7)
* `0.4.12`_ (works with Bazaar 1.6)
* `0.4.11`_ (works with Bazaar 1.6)
* `0.4.11~rc2`_ (works with Bazaar 1.6)
* `0.4.11~rc1`_ (works with Bazaar 1.6)
* 0.4.10_ (works with Bazaar 1.4 and 1.5)
* 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.13: http://samba.org/~jelmer/bzr/bzr-svn-0.4.13.tar.gz
.. _0.4.12: http://samba.org/~jelmer/bzr/bzr-svn-0.4.12.tar.gz
.. _0.4.11: http://samba.org/~jelmer/bzr/bzr-svn-0.4.11.tar.gz
.. _0.4.11~rc2: http://samba.org/~jelmer/bzr/bzr-svn-0.4.11~rc2.tar.gz
.. _0.4.11~rc1: http://samba.org/~jelmer/bzr/bzr-svn-0.4.11~rc1.tar.gz
.. _0.4.10: http://samba.org/~jelmer/bzr/bzr-svn-0.4.10.tar.gz
.. _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
------------

Bazaar
~~~~~~

You will need a recent version of Bazaar, usually the release of Bazaar
released in the same month as the release of bzr-svn you are using. bzr-svn
will warn if the Bazaar release used is too old or too new.

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.

Subversion development files
^^^^^^^^^^^^^^^^^^^^^^^^^^^^

You need the Subversion libraries, including the development files. This should
be readily packaged for most platforms. The package name for Debian
and Debian-based distributions such as Ubuntu is ``libsvn-dev``.

bzr-rebase
^^^^^^^^^^

In order to be able to use the ``svn-upgrade`` command (for those
who used versions of bzr-svn older than 0.4.0), you will need the `bzr-rebase`_
plugin.

.. _bzr-rebase: http://bazaar-vcs.org/Rebase

Building
~~~~~~~~

\!/ Please note that these instructions are only current for bzr-svn 0.4.11 and up.

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'. The plugin has to be built as well by running ``make``.

Packages
~~~~~~~~

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

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 GNU/Linux
^^^^^^^^^^^^^^^^^^^^^^^
Debian/Ubuntu packages are available from `Jelmer's Debian repository`_.

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

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

GoboLinux
^^^^^^^^^
GoboLinux includes `a recipe <http://recipes.gobolinux.org/r/?list=BZR-SVN>`_ for bzr-svn.

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

Mac OS X
^^^^^^^^

Download the latest Subversion DMG from: http://svnbinaries.open.collab.net/servlets/ProjectDocumentList

bzr-svn DMG packages can be found in bzr-svn launchpad page.

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

Development
-----------

Branches
~~~~~~~~
* http://people.samba.org/bzr/jelmer/bzr-svn/trunk (this is where most development happens, bleeding edge)
* http://people.samba.org/bzr/jelmer/bzr-svn/0.4 (current release series)
* http://people.samba.org/bzr/jelmer/bzr-svn/0.3 (old release series)

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.

.. _JelmerVernooij: http://samba.org/~jelmer/

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

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 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 for documentation on that.

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

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

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

Most Bazaar commands should work fine with Subversion branches. The following commands at the moment do not:

  • bzr push --create-prefix

Releases

  • 0.4.13 (works with Bazaar 1.6 and 1.7)
  • 0.4.12 (works with Bazaar 1.6)
  • 0.4.11 (works with Bazaar 1.6)
  • 0.4.11~rc2 (works with Bazaar 1.6)
  • 0.4.11~rc1 (works with Bazaar 1.6)
  • 0.4.10 (works with Bazaar 1.4 and 1.5)
  • 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)

Requirements

Bazaar

You will need a recent version of Bazaar, usually the release of Bazaar released in the same month as the release of bzr-svn you are using. bzr-svn will warn if the Bazaar release used is too old or too new.

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.

Subversion development files

You need the Subversion libraries, including the development files. This should be readily packaged for most platforms. The package name for Debian and Debian-based distributions such as Ubuntu is libsvn-dev.

bzr-rebase

In order to be able to use the svn-upgrade command (for those who used versions of bzr-svn older than 0.4.0), you will need the bzr-rebase plugin.

Building

!/ Please note that these instructions are only current for bzr-svn 0.4.11 and up.

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'. The plugin has to be built as well by running make.

Packages

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

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 GNU/Linux

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

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

GoboLinux

GoboLinux includes a recipe for bzr-svn.

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

Mac OS X

Download the latest Subversion DMG from: http://svnbinaries.open.collab.net/servlets/ProjectDocumentList

bzr-svn DMG packages can be found in bzr-svn launchpad page.

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

Development

Branches

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.