##// END OF EJS Templates
various merge improvements...
various merge improvements -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 various merge improvements add -C flag: force update and overwrite local changes add -m flag: allow merges with conflicts we no longer do merge by default and we print a warning message when the merge fails fix bug in printing merge failure message fix bug diffing files in 'm' state manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj TiNsPIds560S5jgw44eWNto= =GPXN -----END PGP SIGNATURE-----

File last commit:

r262:3db70014 default
r275:61d45b0b default
Show More
demandload.py
15 lines | 384 B | text/x-python | PythonLexer
mpm@selenic.com
implement demand loading hack...
r262 def demandload(scope, modules):
class d:
def __getattr__(self, name):
mod = self.__dict__["mod"]
scope = self.__dict__["scope"]
scope[mod] = __import__(mod, scope, scope, [])
return getattr(scope[mod], name)
for m in modules.split():
dl = d()
dl.mod = m
dl.scope = scope
scope[m] = dl