<!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="Content-Type" content="text/html; charset=utf-8" />
<title>Svn — Bcfg2 1.3.0 documentation</title>
<link rel="stylesheet" href="../../../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '../../../',
VERSION: '1.3.0',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
};
</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/sidebar.js"></script>
<link rel="shortcut icon" href="../../../_static/favicon.ico"/>
<link rel="top" title="Bcfg2 1.3.0 documentation" href="../../../index.html" />
<link rel="up" title="Plugins" href="../index.html" />
<link rel="next" title="Guppy" href="../misc/guppy.html" />
<link rel="prev" title="Mercurial (Hg)" href="hg.html" />
<link rel="stylesheet" href="../../../_static/bcfg2.css" type=""/>
</head>
<body>
<div style="text-align: left; padding: 10px 10px 15px 15px">
<a href="../../../index.html"><img src="../../../_static/bcfg2_logo.png" border="0" alt="sampledoc"/></a>
</div>
<div class="related">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="../../../genindex.html" title="General Index"
accesskey="I">index</a></li>
<li class="right" >
<a href="../../../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="right" >
<a href="../misc/guppy.html" title="Guppy"
accesskey="N">next</a> |</li>
<li class="right" >
<a href="hg.html" title="Mercurial (Hg)"
accesskey="P">previous</a> |</li>
<li><a href="../../../index.html">home</a> | </li>
<!--<li><a href="../../../search.html">search</a> | </li>-->
<li><a href="../../../help/index.html">help</a> | </li>
<li><a href="../../../contents.html">documentation </a> »</li>
<li><a href="../../../contents.html" >Bcfg2 documentation 1.3.0</a> »</li>
<li><a href="../../index.html" >The Bcfg2 Server</a> »</li>
<li><a href="../index.html" accesskey="U">Plugins</a> »</li>
</ul>
</div>
<div class="document">
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body">
<div class="section" id="svn">
<span id="server-plugins-version-svn"></span><h1>Svn<a class="headerlink" href="#svn" title="Permalink to this headline">¶</a></h1>
<p>The Svn plugin is useful if you would like to track changes to your
Bcfg2 repository using a <a class="reference external" href="http://subversion.tigris.org/">Subversion</a>
backend.</p>
<p>As with the other Version plugins, the Svn plugin enables you to get
revision information out of your repository for reporting
purposes. Once the plugin is enabled, every time a client checks in,
it will include the current repository revision in the
reports/statistics.</p>
<p>Additionally, if the <tt class="docutils literal"><span class="pre">pysvn</span></tt> library is installed, the Svn plugin
exposes two XML-RPC method calls:</p>
<ul class="simple">
<li><tt class="docutils literal"><span class="pre">Svn.Update</span></tt> updates the working copy to the latest version in the
repository.</li>
<li><tt class="docutils literal"><span class="pre">Svn.Commit</span></tt> commits any changes to the working copy back to the
repository. In order for this to work, the user Bcfg2 runs as must
be able to commit to the repository non-interactively.</li>
</ul>
<div class="section" id="enabling-the-svn-plugin">
<h2>Enabling the Svn plugin<a class="headerlink" href="#enabling-the-svn-plugin" title="Permalink to this headline">¶</a></h2>
<p>Simply add Svn to your plugins line in <tt class="docutils literal"><span class="pre">/etc/bcfg2.conf</span></tt>:</p>
<div class="highlight-python"><pre>[server]
plugins = Bundler,Cfg,Metadata,..,Svn</pre>
</div>
</div>
<div class="section" id="resolving-conflicts">
<h2>Resolving conflicts<a class="headerlink" href="#resolving-conflicts" title="Permalink to this headline">¶</a></h2>
<p>By default, the Svn plugin does not attempt to resolve conflicts
when trying to commit or update the repository. This can be changed by
adding to <tt class="docutils literal"><span class="pre">/etc/bcfg2.conf</span></tt>, e.g.:</p>
<div class="highlight-python"><div class="highlight"><pre><span class="p">[</span><span class="n">svn</span><span class="p">]</span>
<span class="n">conflict_resolution</span> <span class="o">=</span> <span class="n">theirs</span><span class="o">-</span><span class="n">conflict</span>
</pre></div>
</div>
<p>The possible values of <tt class="docutils literal"><span class="pre">conflict_resolution</span></tt> are:</p>
<ul class="simple">
<li><tt class="docutils literal"><span class="pre">base</span></tt></li>
<li><tt class="docutils literal"><span class="pre">postpone</span></tt> (default)</li>
<li><tt class="docutils literal"><span class="pre">mine-conflict</span></tt></li>
<li><tt class="docutils literal"><span class="pre">theirs-conflict</span></tt></li>
<li><tt class="docutils literal"><span class="pre">mine-full</span></tt></li>
<li><tt class="docutils literal"><span class="pre">theirs-full</span></tt></li>
</ul>
<p>The other possible SVN conflict resolvers (<tt class="docutils literal"><span class="pre">edit</span></tt>, <tt class="docutils literal"><span class="pre">launch</span></tt>,
<tt class="docutils literal"><span class="pre">working</span></tt>) require manual intervention and so are not possible.
Descriptions of each action can be found in the <a class="reference external" href="http://svnbook.red-bean.com/en/1.7/svn.ref.svn.html#svn.ref.svn.sw.accept">Version Control with
Subversion</a>
book.</p>
</div>
</div>
</div>
</div>
</div>
<div class="sphinxsidebar">
<div class="sphinxsidebarwrapper">
<h3><a href="../../../index.html">Table Of Contents</a></h3>
<ul>
<li><a class="reference internal" href="#">Svn</a><ul>
<li><a class="reference internal" href="#enabling-the-svn-plugin">Enabling the Svn plugin</a></li>
<li><a class="reference internal" href="#resolving-conflicts">Resolving conflicts</a></li>
</ul>
</li>
</ul>
<h4>Previous topic</h4>
<p class="topless"><a href="hg.html"
title="previous chapter">Mercurial (Hg)</a></p>
<h4>Next topic</h4>
<p class="topless"><a href="../misc/guppy.html"
title="next chapter">Guppy</a></p>
<h3>This Page</h3>
<ul class="this-page-menu">
<li><a href="../../../_sources/server/plugins/version/svn.txt"
rel="nofollow">Show Source</a></li>
</ul>
<div id="searchbox" style="display: none">
<h3>Quick search</h3>
<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>
<p class="searchtip" style="font-size: 90%">
Enter search terms or a module, class or function name.
</p>
</div>
<script type="text/javascript">$('#searchbox').show(0);</script>
</div>
</div>
<div class="clearer"></div>
</div>
<div class="related">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="../../../genindex.html" title="General Index"
>index</a></li>
<li class="right" >
<a href="../../../py-modindex.html" title="Python Module Index"
>modules</a> |</li>
<li class="right" >
<a href="../misc/guppy.html" title="Guppy"
>next</a> |</li>
<li class="right" >
<a href="hg.html" title="Mercurial (Hg)"
>previous</a> |</li>
<li><a href="../../../index.html">home</a> | </li>
<!--<li><a href="../../../search.html">search</a> | </li>-->
<li><a href="../../../help/index.html">help</a> | </li>
<li><a href="../../../contents.html">documentation </a> »</li>
<li><a href="../../../contents.html" >Bcfg2 documentation 1.3.0</a> »</li>
<li><a href="../../index.html" >The Bcfg2 Server</a> »</li>
<li><a href="../index.html" >Plugins</a> »</li>
</ul>
</div>
<div class="footer">
© Copyright 2009-2013, Narayan Desai.
Last updated on Mar 20, 2013.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
</div>
</body>
</html>
distrib
>
Fedora
>
17
>
i386
>
media
>
updates
>
by-pkgid
>
b50d8ee6d7871fcc13c0677a9364ed59
>
files
>
516
