# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1166409282 28800
# Node ID de6ae8f016afae10f71dd724a0af81ab321fb7c7
# Parent  693eec9570f36547aa5140d54c904fbc179181fa
demandimport: handle already-loaded nested modules in subload

diff --git a/mercurial/demandimport.py b/mercurial/demandimport.py
--- a/mercurial/demandimport.py
+++ b/mercurial/demandimport.py
@@ -51,7 +51,7 @@ class _demandmod(object):
                     h, t = p.split('.', 1)
                 if not hasattr(mod, h):
                     setattr(mod, h, _demandmod(p, mod.__dict__, mod.__dict__))
-                else:
+                elif t:
                     subload(getattr(mod, h), t)
 
             for x in after: