diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-04 06:22:16 -0800 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-04 06:22:16 -0800 |
| commit | dc23257f5fd02474bd425ce5e44dffe0bd29508a (patch) | |
| tree | c5c0af33093087f10f0caf5ce021aa4cb0b4a879 /doc | |
| parent | f35c38e87eafffb497338b9273fe84f284a41dcf (diff) | |
| parent | 09a45d745269a419b0c5da0664912e061dc8e5d3 (diff) | |
| download | bcfg2-dc23257f5fd02474bd425ce5e44dffe0bd29508a.tar.gz bcfg2-dc23257f5fd02474bd425ce5e44dffe0bd29508a.tar.bz2 bcfg2-dc23257f5fd02474bd425ce5e44dffe0bd29508a.zip | |
Merge pull request #54 from kincl/jasons-hacking
Adding a default conflict resolver of theirs-full to Svn Plugin
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/server/plugins/version/svn.txt | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt index 7166ee89d..f7739bd51 100644 --- a/doc/server/plugins/version/svn.txt +++ b/doc/server/plugins/version/svn.txt @@ -32,3 +32,36 @@ 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 = + ++-----------------+ +| Actions | ++=================+ +| base | ++-----------------+ +| postpone | ++-----------------+ +| mine-conflict | ++-----------------+ +| theirs-conflict | ++-----------------+ +| mine-full | ++-----------------+ +| theirs-full | ++-----------------+ + +Descriptions of each action can be found in the `Version Control with +Subversion`_ book. + +.. _Version Control with Subversion: +http://svnbook.red-bean.com/en/1.7/svn.ref.svn.html#svn.ref.svn.sw.accept + |