From 2928afaa547dd8861f0ba9ca2c48c1579c19b48e Mon Sep 17 00:00:00 2001 From: Jason Kincl Date: Tue, 27 Nov 2012 22:23:49 -0500 Subject: adding doc, changing variable names --- doc/server/plugins/version/svn.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'doc') diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt index 7166ee89d..1c62a0b4e 100644 --- a/doc/server/plugins/version/svn.txt +++ b/doc/server/plugins/version/svn.txt @@ -32,3 +32,30 @@ 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 | ++-----------------+ + -- cgit v1.2.3-1-g7c22 From e63eea186a953a53afbcddfae89ec49d602a1353 Mon Sep 17 00:00:00 2001 From: Jason Kincl Date: Wed, 28 Nov 2012 08:50:26 -0500 Subject: fixing logic so try..except works correctly, bugs --- doc/server/plugins/version/svn.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc') diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt index 1c62a0b4e..748dce7c6 100644 --- a/doc/server/plugins/version/svn.txt +++ b/doc/server/plugins/version/svn.txt @@ -48,8 +48,6 @@ adding to ``/etc/bcfg2.conf``:: +=================+ | base | +-----------------+ -| working | -+-----------------+ | mine-conflict | +-----------------+ | theirs-conflict | -- cgit v1.2.3-1-g7c22 From 648c8f6e313e684d5fadc1fdbc97e08d83eb2b16 Mon Sep 17 00:00:00 2001 From: Jason Kincl Date: Mon, 3 Dec 2012 15:27:23 -0500 Subject: Added documentation * added doc link for where information about svn resolution actions can be found --- doc/server/plugins/version/svn.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/server/plugins/version/svn.txt b/doc/server/plugins/version/svn.txt index 748dce7c6..f7739bd51 100644 --- a/doc/server/plugins/version/svn.txt +++ b/doc/server/plugins/version/svn.txt @@ -44,10 +44,12 @@ adding to ``/etc/bcfg2.conf``:: conflict_resolution = +-----------------+ -| Attribute | +| Actions | +=================+ | base | +-----------------+ +| postpone | ++-----------------+ | mine-conflict | +-----------------+ | theirs-conflict | @@ -57,3 +59,9 @@ adding to ``/etc/bcfg2.conf``:: | 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 + -- cgit v1.2.3-1-g7c22