diff options
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Svn.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index 57689cf33..bc585570d 100644 --- a/src/lib/Bcfg2/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py @@ -21,6 +21,10 @@ class Svn(Bcfg2.Server.Plugin.Version): if HAS_SVN: __rmi__ = Bcfg2.Server.Plugin.Version.__rmi__ + ['Update', 'Commit'] + def callback_conflict_resolver(self): + """PySvn callback function to resolve conflicts""" + return pysvn.wc_conflict_choice.theirs_full, None, False + def __init__(self, core, datastore): Bcfg2.Server.Plugin.Version.__init__(self, core, datastore) @@ -32,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) @@ -89,7 +94,7 @@ class Svn(Bcfg2.Server.Plugin.Version): self.logger.info("Updated %s from revision %s to %s" % \ (self.vcs_root, old_revision, self.revision.number)) return True - + def Commit(self): """Svn.Commit() => True|False\nCommit svn repository\n""" # First try to update |