← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

Removed todo, restored test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
653
653
        assert 'hi world' not in conflict_text
654
654
        os.unlink('hello.OTHER')
655
655
        self.runbzr('remerge hello --merge-type weave', retcode=1)
656
 
        # FIXME weave merge demands no changes to working tree, even for
657
 
        # uninteresting files
658
 
        # assert os.path.exists('hello.OTHER')
 
656
        assert os.path.exists('hello.OTHER')
659
657
        self.runbzr('remerge --merge-type weave', retcode=1)
660
658
        assert os.path.exists('hello.OTHER')
661
659
        assert not os.path.exists('hello.BASE')