tests/test-conflict.out
author Vadim Gelfer <vadim.gelger@gmail.com>
Thu, 02 Mar 2006 11:38:03 -0800
changeset 1826 f3abe0bdccdd
parent 925 5a034646e472
child 1933 7544700fd931
permissions -rw-r--r--
rewrite demandload module to be more flexible. performance not affected. old demandload module could only import top-level modules like os and sys. with rewrite, all of following syntax is emulated perfectly: import foo, bar foo bar import foo.bar.quux foo.bar.quux from foo.bar import quux, blurfl foo.bar:quux,blurfl only thing missing is "import foo as bar". also, namespace clashes between placeholder object and demand loaded module are no longer possible.

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a