blob: 1c62a0b4eec178d5029d00e14a85d00cff1c0c54 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
.. -*- mode: rst -*-
.. _server-plugins-version-svn:
===
Svn
===
The Svn plugin is useful if you would like to track changes to your
Bcfg2 repository using a `Subversion <http://subversion.tigris.org/>`_
backend.
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.
Additionally, if the ``pysvn`` library is installed, the Svn plugin
exposes two XML-RPC method calls:
* ``Svn.Update`` updates the working copy to the latest version in the
repository.
* ``Svn.Commit`` 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.
Enabling the Svn plugin
=======================
Simply add Svn to your plugins line in ``/etc/bcfg2.conf``::
[server]
plugins = Bundler,Cfg,Metadata,..,Svn
Resolving conflicts
=======================
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 ``/etc/bcfg2.conf``::
[Svn]
conflict_resolution =
+-----------------+
| Attribute |
+=================+
| base |
+-----------------+
| working |
+-----------------+
| mine-conflict |
+-----------------+
| theirs-conflict |
+-----------------+
| mine-full |
+-----------------+
| theirs-full |
+-----------------+
|