1 Bazaar support for Subversion branches, working trees and repositories
2 ======================================================================
9 bzr-svn is a plugin that allows Bazaar_ direct access to Subversion_
10 repositories. It allows most bzr commands to work directly against Subversion
11 repositories, as if you were using bzr with a native bzr repository.
13 .. _Bazaar: http://bazaar-vcs.org/
14 .. _Subversion: http://subversion.tigris.org/
16 The plugin can at the moment be used to commit to, pull from, merge from, push
17 to and view logs of Subversion branches from Bazaar.
23 The following features are currently present:
25 - Connecting to remote Subversion repositories over all
26 protocols supported by Subversion itself (at present:
27 svn://, svn+ssh://, http:// (webdav), file://)
28 as well as dump files.
30 Checkouts, lightweight checkouts and branching works.
32 - Integrates well with Bazaar.
34 - Track Bazaar merges in Subversion. Merged revisions show up
37 - Subversion working copies. Can be modified, queried
38 (``bzr status`` on a svn- native working copy created with
39 ``svn co`` works) and committed from.
41 - Committing to Subversion from Bazaar.
43 - Push Bazaar revisions to Subversion.
45 - Follow branch copies. Revision history is not
46 truncated when a branch was copied in Subversion.
48 - Efficiently uses network bandwidth.
50 - Recognizes file metadata (executable bits, symbolic links).
52 - 'svn-import' command with functionality similar to svn2bzr_.
54 .. _svn2bzr: http://bazaar-vcs.org/svn2bzr
56 - Ability to track merges done with SVK_ and write merges from SVK/Subversion
57 branches in a format understandable by SVK.
59 .. _SVK: http://svk.elixus.org/
61 - Writes svn:mergeinfo property used by Subversion 1.5.
63 - Generates consistent file ids and revision ids. Two branches made using
64 this plugin of the same Subversion branch will result in *exactly* the same
67 - Handles complex operations in Subversion: committing to two branches at
68 once, upgrading directories to branches, copies from early revisions, ...
70 - Tested on Linux, Windows and Mac OS X.
75 bzr-svn can be used through the regular Bazaar user interface, see the
76 `Bazaar Documentation Overview`_ for documentation on that.
78 .. _Bazaar Documentation Overview: Documentation
80 Some bzr-svn specific issues are answered by the FAQ_.
82 .. _FAQ: http://samba.org/~jelmer/bzr-svn/FAQ.html
84 The way Bazaar metadata is stored in Subversion and the other way around is
85 specified in the `mapping specification`_.
87 .. _mapping specification: BzrForeignBranches/Subversion/mapping
92 Unsupported Subversion File Properties
93 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
95 Some Subversion properties can currently not be represented in Bazaar and are
96 therefore ignored for the time being:
98 - 'svn:ignore'. There should be a `Repository.get_ignores(revid)` call in
99 Bazaar rather than a magic '.bzrignore' file.
100 Spec at https://launchpad.net/products/bzr/+spec/new-ignore-rules
104 - 'svn:eol-style'. Requires eol support in Bazaar.
106 - 'svn:keywords'. Requires keywords support in Bazaar. Spec at
107 https://launchpad.net/products/bzr/+spec/bzr-keyword-expansion.
108 `#81463 <https://bugs.launchpad.net/bzr-svn/+bug/81463>`_
110 - 'svn:externals'. Externals should be mapped to Bazaar 'by-reference'
111 nested branches and the other way around. This can't be implemented
112 until Bazaars nested branch support lands.
118 In the future, I also hope to support:
120 - Renames. Initial work has been done to support this,
121 but the number of corner cases is wide, so support for this
122 has not been enabled by default yet.
124 - Override implementation of get_revision_delta(). Will speed up 'bzr log -v'
126 - use svn_ra_replay() when using servers that have Subversion 1.4. Saves a
127 couple of roundtrips when fetching history.
129 Some Subversion properties can currently not be represented in Bazaar
130 and are therefore ignored for the time being:
132 Other features currently held back by Bazaars feature set:
136 Spec at https://launchpad.net/products/bzr/+spec/filecopies
138 - Showing SVN merges as merges in Bazaar. This requires full merge tracking
139 information in Subversion, something which the Subversion folks are working
140 on at the moment (see https://svn.collab.net/repos/svn/branches/merge-tracking).
142 Requires tracking cherry-picking support in Bazaar:
144 Spec at https://launchpad.net/products/bzr/+spec/bzr-cpick-data
148 Ask bzr-svn related questions on the `Bazaar mailing list`_ or in the
149 #bzr IRC channel on Freenode_.
151 .. _Bazaar mailing list: http://lists.canonical.com/listinfo/bazaar/
152 .. _Freenode: http://www.freenode.net/
157 Please file bug reports in launchpad. The product URL for bzr-svn is
158 https://launchpad.net/bzr-svn/.
160 The wiki for this plugin is at http://bazaar-vcs.org/BzrForeignBranches/Subversion.