[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----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