Bazaar

Bazaar

 




Wiki Tools

  • Find Page
  • Recent Changes
  • Page History
  • Attachments

Differences between revisions 179 and 253 (spanning 74 versions)
Revision 179 as of 2008-05-23 16:12:59
Size: 13663
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 5: Line 6:
Line 20: Line 22:
It also provides a Bazaar subcommand ("bzr svn-import") for converting
complete Subversion repositories to Bazaar repositories.
Line 35: Line 39:
- Track Bazaar merges in Subversion. Merged revisions show up
  as ghosts.
- Track Bazaar merges in Subversion.
Line 57: Line 60:
- Ability to track merges done with SVK_ and write merges from SVK/Subversion branches in a format understandable by SVK. - Ability to track merges done with SVK_ and write merges from SVK/Subversion
 
branches in a format understandable by SVK.
Line 60: Line 64:

- Writes svn:mergeinfo property used by Subversion 1.5.
Line 74: Line 80:
`Bazaar Documentation Overview`_ for documentation on that. `Bazaar Documentation Overview`_ and the `Bazaar User Guide`_ for documentation on that.
Line 77: Line 83:

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
.. _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.
Line 111: Line 112:
Other features currently held back by Bazaars feature set:
Line 113: Line 116:
  this until Bazaars nested branch support lands. AaronBentley's work
  in progress is at http://code.aaronbentley.com/bzr/bzrrepo/nested-trees/.
  This has been delayed until after 0.9 because of required repository
  format changes.

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
  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.
Line 132: Line 129:
Most Bazaar commands should work fine with Subversion branches. The following commands do not:

- bzr uncommit
 - bzr push --overwrite
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 140: Line 134:
* 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.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
See https://launchpad.net/bzr-svn/+download for a current list of releases.
Line 186: Line 142:
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
You will need a recent version of Bazaar. bzr-svn
Line 190: Line 145:
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.

Fedora 9 (i386)
^^^^^^^^^^^^^^^
Fedora 9 (i386) users may obtain Subversion RPMs built with the patch from http://www.laserjock.us/files/fedora/ .

Mac OS X
^^^^^^^^

From Source
************

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,
  # but disables any support for authenticating
  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.

Using (release candidate) installer
***********************************

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

After installing, add the svn-python bindings to your Python2.5 installation

::

  # Tiger
  echo "/opt/subversion-1.5.x/lib/svn-python/" > /Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/subversion.pth

  # Leopard
  echo "/opt/subversion-1.5.x/lib/svn-python/" > /System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/subversion.pth

Install the bzr_svn plugin following the instructions in the `From Source`_ section (a DMG is coming soon ;) )


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
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 333: Line 163:
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.
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 341: 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 351: Line 201:
Development
-----------

Branches
~~~~~~~~
* http://people.samba.org/bzr/jelmer/bzr-svn/0.4 (stable release series, this is where most development happens)
* 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.

.. _JelmerVernooij: http://samba.org/~jelmer/
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

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.