diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-04 09:33:06 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-04 09:33:06 -0600 |
| commit | 3ee3158d866170f911c2b6834f54137d13e58aa7 (patch) | |
| tree | 9dfebe390c9f281178cdb801ce1fb3d191b7c3c2 /doc | |
| parent | dc23257f5fd02474bd425ce5e44dffe0bd29508a (diff) | |
| download | bcfg2-3ee3158d866170f911c2b6834f54137d13e58aa7.tar.gz bcfg2-3ee3158d866170f911c2b6834f54137d13e58aa7.tar.bz2 bcfg2-3ee3158d866170f911c2b6834f54137d13e58aa7.zip | |
Svn: cleaned up conflict resolution stuff
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/server/plugins/version/svn.txt | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt index f7739bd51..d0c5c2317 100644 --- a/doc/server/plugins/version/svn.txt +++ b/doc/server/plugins/version/svn.txt @@ -36,29 +36,24 @@ Simply add Svn to your plugins line in ``/etc/bcfg2.conf``:: Resolving conflicts ======================= -By default, the Svn plugin does not attempt to resolve 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 = - -+-----------------+ -| Actions | -+=================+ -| base | -+-----------------+ -| postpone | -+-----------------+ -| mine-conflict | -+-----------------+ -| theirs-conflict | -+-----------------+ -| mine-full | -+-----------------+ -| theirs-full | -+-----------------+ +adding to ``/etc/bcfg2.conf``, e.g.:: + [svn] + conflict_resolution = theirs-conflict + +The possible values of ``conflict_resolution`` are: + +* ``base`` +* ``postpone`` (default) +* ``mine-conflict`` +* ``theirs-conflict`` +* ``mine-full` +* ``theirs-full`` + +The other possible SVN conflict resolvers (``edit``, ``launch``, +``working``) require manual intervention and so are not possible. Descriptions of each action can be found in the `Version Control with Subversion`_ book. |