diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2012-11-27 22:23:49 -0500 |
|---|---|---|
| committer | Jason Kincl <kincljc@ornl.gov> | 2012-11-27 22:23:49 -0500 |
| commit | 2928afaa547dd8861f0ba9ca2c48c1579c19b48e (patch) | |
| tree | 70de2c463d6ad1889b3694a1d99f51639618bf62 | |
| parent | 10105b311788549bbc6136884bb3e6133d86b1b3 (diff) | |
| download | bcfg2-2928afaa547dd8861f0ba9ca2c48c1579c19b48e.tar.gz bcfg2-2928afaa547dd8861f0ba9ca2c48c1579c19b48e.tar.bz2 bcfg2-2928afaa547dd8861f0ba9ca2c48c1579c19b48e.zip | |
adding doc, changing variable names
| -rw-r--r-- | doc/server/plugins/version/svn.txt | 27 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 6 |
2 files changed, 30 insertions, 3 deletions
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 | ++-----------------+ + diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index 9ec334dd0..b1f8ef388 100644 --- a/src/lib/Bcfg2/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py @@ -53,14 +53,14 @@ class Svn(Bcfg2.Server.Plugin.Version): else: self.client = pysvn.Client() try: - if self.core.setup.cfg.has_option("svn", + if self.core.setup.cfg.has_option("Svn", "conflict_resolution"): - self.svn_resolution = self.core.setup.cfp.get("svn", + self.svn_resolution = self.core.setup.cfp.get("Svn", "conflict_resolution") self.client.callback_conflict_resolver = \ self.callback_conflict_resolver except ConfigParser.NoSectionError: - msg = "Svn: No [svn] section found in bcfg2.conf" + msg = "Svn: No [Svn] section found in bcfg2.conf" self.logger.warning(msg) except ConfigParser.NoOptionError: msg = "Svn: Option not found in bcfg2.conf: %s" % \ |