Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default heads
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 25 Apr 2013 15:45:38 +0200
changeset 8925 57f8a02550cc
parent 8924 8666438778c7 (diff)
parent 8923 acff6dfcb9f4 (current diff)
child 8928 f5b40b66d36e
merge default heads
--- 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)
cubicweb