Tidy up conflict and pull tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tidy up conflict and pull tests Fix failure to kill hg serve process and pipeline ordering with set -e manifest hash: eaf968ea8ae9fe1fc94f04b99080eabcc6eafd88 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsv9vywK+sNU5EO8RAh2aAJ4iynCcNhmQeOy9+dq+v+9IundFIwCfWHgg pI3IH2BvqUlckdLwx3M5jcQ= =s/QA -----END PGP SIGNATURE-----

     1

def demandload(scope, modules):

     2

    class d:

     3

        def __getattr__(self, name):

     4

            mod = self.__dict__["mod"]

     5

            scope = self.__dict__["scope"]

     6

            scope[mod] = __import__(mod, scope, scope, [])

     7

            return getattr(scope[mod], name)

     8

     9

    for m in modules.split():

    10

        dl = d()

    11

        dl.mod = m

    12

        dl.scope = scope

    13

        scope[m] = dl

    14

    15