diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Svn.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn.py b/src/lib/Bcfg2/Server/Plugins/Svn.py index a3a149b1f..d444b6a0c 100644 --- a/src/lib/Bcfg2/Server/Plugins/Svn.py +++ b/src/lib/Bcfg2/Server/Plugins/Svn.py @@ -36,6 +36,9 @@ class Svn(Bcfg2.Server.Plugin.Version): def callback_conflict_resolver(self, conflict_description): """PySvn callback function to resolve conflicts""" + self.logger.info("Svn: Resolving conflict for %s with %s" % \ + (conflict_description['path'], + self.svn_resolution) return self.conflict_resolution_map[self.svn_resolution], None, False def __init__(self, core, datastore): |