all but one bzr test pass (merge-base)
tst skip failing test
cln up with shell_out