# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1366897538 -7200
# Node ID 57f8a02550cc4ec54ff79777128ba6fc35682b2f
# Parent  8666438778c72f792af41c6ef2eb258aaf97d695# Parent  acff6dfcb9f4119fc8860a07136abea028e038cd
merge default heads

diff -r acff6dfcb9f4 -r 57f8a02550cc server/serverctl.py
--- a/server/serverctl.py	Thu Apr 25 12:12:15 2013 +0200
+++ b/server/serverctl.py	Thu Apr 25 15:45:38 2013 +0200
@@ -39,7 +39,6 @@
 from cubicweb.server.serverconfig import (
     USER_OPTIONS, ServerConfiguration, SourceConfiguration,
     ask_source_config, generate_source_config)
-from yams.diff import schema_diff
 
 # utility functions ###########################################################
 
@@ -1077,6 +1076,7 @@
     min_args = max_args = 2
 
     def run(self, args):
+        from yams.diff import schema_diff
         appid = args.pop(0)
         diff_tool = args.pop(0)
         config = ServerConfiguration.config_for(appid)