Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 1 and 252 (spanning 251 versions)
Revision 1 as of 2005-11-22 01:48:01
Size: 789
Comment: Add page about support for foreign Subversion branches.
Revision 252 as of 2011-08-15 18:00:55
Size: 7490
Editor: jelmer
Comment: remove long list of old releases, instead point at separate page
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.
## page was renamed from BzrForeignBranches/Subversion
#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.

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

.. _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`_ and the `Bazaar User Guide`_ for documentation on that.

.. _Bazaar Documentation Overview: Documentation
.. _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
  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
~~~~~~~~~~~~~~~

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

* `1.0.4`_ (works with Bazaar 2.2)
* `1.0.3`_ (works with Bazaar 2.2)
* `1.0.2`_ (works with Bazaar 2.0, 2.1)

`all releases`_

.. _all releases: http://samba.org/~jelmer/bzr-svn/all-releases.html
.. _1.0.4: http://samba.org/~jelmer/bzr/bzr-svn-1.0.4.tar.gz
.. _1.0.3: http://samba.org/~jelmer/bzr/bzr-svn-1.0.3.tar.gz
.. _1.0.2: http://samba.org/~jelmer/bzr/bzr-svn-1.0.2.tar.gz
.. _1.0.1: http://samba.org/~jelmer/bzr/bzr-svn-1.0.1.tar.gz

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.

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

Building
--------

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``.:w


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.

.. _Windows installers for Bazaar: https://edge.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
~~~~~~~~~~~~~~
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/.

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

Branches
~~~~~~~~

* lp:bzr-svn (current release series)

Unit testing
~~~~~~~~~~~~
To run the bzr-svn testsuite, simply run 'bzr selftest 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

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.

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

  • 1.0.4 (works with Bazaar 2.2)
  • 1.0.3 (works with Bazaar 2.2)
  • 1.0.2 (works with Bazaar 2.0, 2.1)

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

Building

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

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

Development

Branches

  • lp:bzr-svn (current release series)

Unit testing

To run the bzr-svn testsuite, simply run 'bzr selftest 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.

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.