merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
uisetup called
ui.parentui isnot None
reposetup called for a
ui == repo.ui
Foo
uisetup called
ui.parentui is None
reposetup called for a
ui == repo.ui
reposetup called for b
ui == repo.ui
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
uisetup called
ui.parentui is None
Bar
% module/__init__.py-style
uisetup called
ui.parentui isnot None
reposetup called for a
ui == repo.ui
Foo
empty extension - empty cmdtable
no commands defined