summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server
diff options
context:
space:
mode:
authorJason Kincl <kincljc@ornl.gov>2012-11-07 14:42:10 -0500
committerJason Kincl <kincljc@ornl.gov>2012-11-07 14:42:10 -0500
commit16359ae0f40b80c5ddc5bf495d3c1081bf5b81b3 (patch)
treec5b7c5b698b3731e68aecc552552132c3b68761a /src/lib/Bcfg2/Server
parentdb60e20ca7a328509da99862a1634639dd45cf5d (diff)
downloadbcfg2-16359ae0f40b80c5ddc5bf495d3c1081bf5b81b3.tar.gz
bcfg2-16359ae0f40b80c5ddc5bf495d3c1081bf5b81b3.tar.bz2
bcfg2-16359ae0f40b80c5ddc5bf495d3c1081bf5b81b3.zip
Adding a default conflict resolver of theirs-full to Svn Plugin
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Svn.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py
index fda6b57b5..ac1c73160 100644
--- a/src/lib/Bcfg2/Server/Plugins/Svn.py
+++ b/src/lib/Bcfg2/Server/Plugins/Svn.py
@@ -22,6 +22,9 @@ class Svn(Bcfg2.Server.Plugin.Version):
else:
__vcs_metadata_path__ = ".svn"
+ def callback_conflict_resolver(self):
+ return pysvn.wc_conflict_choice.theirs_full, None, False
+
def __init__(self, core, datastore):
Bcfg2.Server.Plugin.Version.__init__(self, core, datastore)
@@ -33,6 +36,7 @@ class Svn(Bcfg2.Server.Plugin.Version):
self.client = None
else:
self.client = pysvn.Client()
+ self.client.callback_conflict_resolver = self.callback_conflict_resolver
self.logger.debug("Initialized svn plugin with SVN directory %s" %
self.vcs_path)