<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>bzr-svn — Bazaar 2.7.0 documentation</title>
<link rel="stylesheet" href="../_static/classic.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript" id="documentation_options" data-url_root="../" src="../_static/documentation_options.js"></script>
<script type="text/javascript" src="../_static/jquery.js"></script>
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<script type="text/javascript" src="../_static/language_data.js"></script>
<link rel="shortcut icon" href="../_static/bzr.ico"/>
<link rel="search" title="Search" href="../search.html" />
<link rel="next" title="Web browsing" href="web_browsing.html" />
<link rel="prev" title="BzrTools" href="bzrtools_plugin.html" />
</head><body>
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="web_browsing.html" title="Web browsing"
accesskey="N">next</a></li>
<li class="right" >
<a href="bzrtools_plugin.html" title="BzrTools"
accesskey="P">previous</a> |</li>
<li><a href="http://bazaar.canonical.com/">
<img src="../_static/bzr icon 16.png" /> Home</a> | </li>
<a href="http://doc.bazaar.canonical.com/en/">Documentation</a> | </li>
<li class="nav-item nav-item-0"><a href="../index.html">Table of Contents (2.7.0)</a> »</li>
<li class="nav-item nav-item-1"><a href="index.html" accesskey="U">Bazaar User Guide</a> »</li>
</ul>
</div>
<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body" role="main">
<div class="section" id="bzr-svn">
<h1>bzr-svn<a class="headerlink" href="#bzr-svn" title="Permalink to this headline">¶</a></h1>
<div class="section" id="overview">
<h2>Overview<a class="headerlink" href="#overview" title="Permalink to this headline">¶</a></h2>
<p>bzr-svn lets developers use Bazaar as their VCS client on projects
still using a central Subversion repository. Access to Subversion
repositories is largely transparent, i.e. you can use most <code class="docutils literal notranslate"><span class="pre">bzr</span></code>
commands directly on Subversion repositories exactly the same
as if you were using <code class="docutils literal notranslate"><span class="pre">bzr</span></code> on native Bazaar branches.</p>
<p>Many bzr-svn users create a local mirror of the central Subversion
trunk, work in local feature branches, and submit their
overall change back to Subversion when it is ready
to go. This lets them gain many of the advantages of distributed
VCS tools without interrupting existing team-wide processes and
tool integration hooks currently built on top of Subversion. Indeed,
this is a common interim step for teams looking to adopt Bazaar but
who are unable to do so yet for timing or non-technical reasons.</p>
<p>For installation instructions, see the bzr-svn home page:
<a class="reference external" href="http://wiki.bazaar.canonical.com/BzrForeignBranches/Subversion">http://wiki.bazaar.canonical.com/BzrForeignBranches/Subversion</a>.</p>
</div>
<div class="section" id="a-simple-example">
<h2>A simple example<a class="headerlink" href="#a-simple-example" title="Permalink to this headline">¶</a></h2>
<p>Here’s a simple example of how you can use bzr-svn to hack on a
GNOME project like <strong>beagle</strong>. Firstly, setup a local shared repository
for storing your branches in and checkout the trunk:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">init</span><span class="o">-</span><span class="n">repo</span> <span class="n">beagle</span><span class="o">-</span><span class="n">repo</span>
<span class="n">cd</span> <span class="n">beagle</span><span class="o">-</span><span class="n">repo</span>
<span class="n">bzr</span> <span class="n">checkout</span> <span class="n">svn</span><span class="o">+</span><span class="n">ssh</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="o">.</span><span class="n">gnome</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">svn</span><span class="o">/</span><span class="n">beagle</span><span class="o">/</span><span class="n">trunk</span> <span class="n">beagle</span><span class="o">-</span><span class="n">trunk</span>
</pre></div>
</div>
<p>Next, create a feature branch and hack away:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">branch</span> <span class="n">beagle</span><span class="o">-</span><span class="n">trunk</span> <span class="n">beagle</span><span class="o">-</span><span class="n">feature1</span>
<span class="n">cd</span> <span class="n">beagle</span><span class="o">-</span><span class="n">feature1</span>
<span class="p">(</span><span class="n">hack</span><span class="p">,</span> <span class="n">hack</span><span class="p">,</span> <span class="n">hack</span><span class="p">)</span>
<span class="n">bzr</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s2">"blah blah blah"</span>
<span class="p">(</span><span class="n">hack</span><span class="p">,</span> <span class="n">hack</span><span class="p">,</span> <span class="n">hack</span><span class="p">)</span>
<span class="n">bzr</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s2">"blah blah blah"</span>
</pre></div>
</div>
<p>When the feature is cooked, refresh your trunk mirror and merge
your change:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">../</span><span class="n">beagle</span><span class="o">-</span><span class="n">trunk</span>
<span class="n">bzr</span> <span class="n">update</span>
<span class="n">bzr</span> <span class="n">merge</span> <span class="o">../</span><span class="n">beagle</span><span class="o">-</span><span class="n">feature1</span>
<span class="n">bzr</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s2">"Complete comment for SVN commit"</span>
</pre></div>
</div>
<p>As your trunk mirror is a checkout, committing to it implicitly
commits to the real Subversion trunk. That’s it!</p>
</div>
<div class="section" id="using-a-central-repository-mirror">
<h2>Using a central repository mirror<a class="headerlink" href="#using-a-central-repository-mirror" title="Permalink to this headline">¶</a></h2>
<p>For large projects, it often makes sense to tweak the recipe given above.
In particular, the initial checkout can get quite slow so you may wish
to import the Subversion repository into a Bazaar one once and for all
for your project, and then branch from that native Bazaar repository
instead. bzr-svn provides the <code class="docutils literal notranslate"><span class="pre">svn-import</span></code> command for doing this
repository-to-repository conversion. Here’s an example of how to use it:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">svn</span><span class="o">-</span><span class="kn">import</span> <span class="nn">svn</span><span class="o">+</span><span class="n">ssh</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="o">.</span><span class="n">gnome</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">svn</span><span class="o">/</span><span class="n">beagle</span>
</pre></div>
</div>
<p>Here’s the recipe from above updated to use a central Bazaar mirror:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">bzr</span> <span class="n">init</span><span class="o">-</span><span class="n">repo</span> <span class="n">beagle</span><span class="o">-</span><span class="n">repo</span>
<span class="n">cd</span> <span class="n">beagle</span><span class="o">-</span><span class="n">repo</span>
<span class="n">bzr</span> <span class="n">branch</span> <span class="n">bzr</span><span class="o">+</span><span class="n">ssh</span><span class="p">:</span><span class="o">//</span><span class="n">bzr</span><span class="o">.</span><span class="n">gnome</span><span class="o">.</span><span class="n">org</span><span class="o">/</span><span class="n">beagle</span><span class="o">.</span><span class="n">bzr</span><span class="o">/</span><span class="n">trunk</span> <span class="n">beagle</span><span class="o">-</span><span class="n">trunk</span>
<span class="n">bzr</span> <span class="n">branch</span> <span class="n">beagle</span><span class="o">-</span><span class="n">trunk</span> <span class="n">beagle</span><span class="o">-</span><span class="n">feature1</span>
<span class="n">cd</span> <span class="n">beagle</span><span class="o">-</span><span class="n">feature1</span>
<span class="p">(</span><span class="n">hack</span><span class="p">,</span> <span class="n">hack</span><span class="p">,</span> <span class="n">hack</span><span class="p">)</span>
<span class="n">bzr</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s2">"blah blah blah"</span>
<span class="p">(</span><span class="n">hack</span><span class="p">,</span> <span class="n">hack</span><span class="p">,</span> <span class="n">hack</span><span class="p">)</span>
<span class="n">bzr</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s2">"blah blah blah"</span>
<span class="n">cd</span> <span class="o">../</span><span class="n">beagle</span><span class="o">-</span><span class="n">trunk</span>
<span class="n">bzr</span> <span class="n">pull</span>
<span class="n">bzr</span> <span class="n">merge</span> <span class="o">../</span><span class="n">beagle</span><span class="o">-</span><span class="n">feature1</span>
<span class="n">bzr</span> <span class="n">commit</span> <span class="o">-</span><span class="n">m</span> <span class="s2">"Complete comment for SVN commit"</span>
<span class="n">bzr</span> <span class="n">push</span>
</pre></div>
</div>
<p>In this case, committing to the trunk only commits the merge locally.
To commit back to the master Subversion trunk, an additional command
(<code class="docutils literal notranslate"><span class="pre">bzr</span> <span class="pre">push</span></code>) is required.</p>
<p>Note: You’ll need to give <code class="docutils literal notranslate"><span class="pre">pull</span></code> and <code class="docutils literal notranslate"><span class="pre">push</span></code> the relevant URLs
the first time you use those commands in the trunk branch. After that,
bzr remembers them.</p>
<p>The final piece of the puzzle in this setup is to put scripts in
place to keep the central Bazaar mirror synchronized with the Subversion
one. This can be done by adding a cron job, using a Subversion hook,
or whatever makes sense in your environment.</p>
</div>
<div class="section" id="limitations-of-bzr-svn">
<h2>Limitations of bzr-svn<a class="headerlink" href="#limitations-of-bzr-svn" title="Permalink to this headline">¶</a></h2>
<p>Bazaar and Subversion are different tools with different capabilities
so there will always be some limited interoperability issues.
Here are some examples current as of bzr-svn 0.5.4:</p>
<blockquote>
<div><ul class="simple">
<li>Bazaar doesn’t support versioned properties</li>
<li>Bazaar doesn’t support tracking of file copies.</li>
</ul>
</div></blockquote>
<p>See the bzr-svn web page,
<a class="reference external" href="http://wiki.bazaar.canonical.com/BzrForeignBranches/Subversion">http://wiki.bazaar.canonical.com/BzrForeignBranches/Subversion</a>,
for the current list of constraints.</p>
</div>
</div>
</div>
</div>
</div>
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
<div class="sphinxsidebarwrapper">
<h3><a href="../index.html">Table of Contents</a></h3>
<ul>
<li><a class="reference internal" href="#">bzr-svn</a><ul>
<li><a class="reference internal" href="#overview">Overview</a></li>
<li><a class="reference internal" href="#a-simple-example">A simple example</a></li>
<li><a class="reference internal" href="#using-a-central-repository-mirror">Using a central repository mirror</a></li>
<li><a class="reference internal" href="#limitations-of-bzr-svn">Limitations of bzr-svn</a></li>
</ul>
</li>
</ul>
<h4>Previous topic</h4>
<p class="topless"><a href="bzrtools_plugin.html"
title="previous chapter">BzrTools</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="web_browsing.html"
title="next chapter">Web browsing</a></p>
<div role="note" aria-label="source link">
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../_sources/user-guide/svn_plugin.txt"
rel="nofollow">Show Source</a></li>
</ul>
</div>
<div id="searchbox" style="display: none" role="search">
<h3>Quick search</h3>
<div class="searchformwrapper">
<form class="search" action="../search.html" method="get">
<input type="text" name="q" />
<input type="submit" value="Go" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>
</div>
<script type="text/javascript">$('#searchbox').show(0);</script>
</div>
</div>
<div class="clearer"></div>
</div>
<div class="related" role="navigation" aria-label="related navigation">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="web_browsing.html" title="Web browsing"
>next</a></li>
<li class="right" >
<a href="bzrtools_plugin.html" title="BzrTools"
>previous</a> |</li>
<li><a href="http://bazaar.canonical.com/">
<img src="../_static/bzr icon 16.png" /> Home</a> | </li>
<a href="http://doc.bazaar.canonical.com/en/">Documentation</a> | </li>
<li class="nav-item nav-item-0"><a href="../index.html">Table of Contents (2.7.0)</a> »</li>
<li class="nav-item nav-item-1"><a href="index.html" >Bazaar User Guide</a> »</li>
</ul>
</div>
<div class="footer" role="contentinfo">
© Copyright 2009-2011 Canonical Ltd.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.8.4.
</div>
</body>
</html>
