# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1248280521 -7200
# Node ID f6757021018fe41c6f042f4734d4d3ca01c660aa
# Parent  96da7dc42eb599420cb06c05a0a67194311a346e# Parent  08d42928fe367b6d8bb4ea6cfda63f1b1c9ccf32
merge

diff -r 96da7dc42eb5 -r f6757021018f doc/book/en/admin/setup.rst
--- a/doc/book/en/admin/setup.rst	Wed Jul 22 18:35:08 2009 +0200
+++ b/doc/book/en/admin/setup.rst	Wed Jul 22 18:35:21 2009 +0200
@@ -47,7 +47,7 @@
 There is also a wide variety of cubes listed on http://www.cubicweb.org/Project available as debian packages and tarball.
 
 The repositories are signed with `Logilab's gnupg key`_. To avoid warning on "apt-get update":
-1. become root using sudo 
+1. become root using sudo
 2. download http://ftp.logilab.org/dists/logilab-dists-key.asc using e.g. wget
 3. run "apt-key add logilab-dists-key.asc"
 4. re-run apt-get update (manually or through the package manager, whichever you prefer)
@@ -69,6 +69,10 @@
   hg fclone http://www.logilab.org/hg/forests/cubicweb
 
 See :ref:`MercurialPresentation` for more details about Mercurial.
+When cloning a repository, you might be set in a development branch
+(the 'default' branch). You should check that the branches of the
+repositories are set to 'stable' (using `hg up stable` for each one)
+if you do not intend to develop the framework itself.
 
 Postgres installation
 `````````````````````
diff -r 96da7dc42eb5 -r f6757021018f entity.py
--- a/entity.py	Wed Jul 22 18:35:08 2009 +0200
+++ b/entity.py	Wed Jul 22 18:35:21 2009 +0200
@@ -23,13 +23,9 @@
 from cubicweb.appobject import AppRsetObject
 from cubicweb.schema import RQLVocabularyConstraint, RQLConstraint, bw_normalize_etype
 
-try:
-    from cubicweb.common.uilib import printable_value, soup2xhtml
-    from cubicweb.common.mixins import MI_REL_TRIGGERS
-    from cubicweb.common.mttransforms import ENGINE
-except ImportError:
-    # missing -common
-    MI_REL_TRIGGERS = {}
+from cubicweb.common.uilib import printable_value, soup2xhtml
+from cubicweb.common.mixins import MI_REL_TRIGGERS
+from cubicweb.common.mttransforms import ENGINE
 
 _marker = object()