/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Martin Pool
  • Date: 2008-02-13 01:35:27 UTC
  • mto: (3221.6.1 1.2)
  • mto: This revision was merged to the branch mainline in revision 3222.
  • Revision ID: mbp@sourcefrog.net-20080213013527-ml201846kikzon42
Update and rename test for Dirstate._changes_aborted

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
646
646
        finally:
647
647
            state.unlock()
648
648
 
649
 
    def test_save_refuses_if_inconsistent(self):
 
649
    def test_save_refuses_if_changes_aborted(self):
650
650
        self.build_tree(['a-file', 'a-dir/'])
651
651
        state = dirstate.DirState.initialize('dirstate')
652
652
        try:
672
672
 
673
673
            # Now modify the state, but mark it as inconsistent
674
674
            state.add('a-dir', 'a-dir-id', 'directory', None, '')
675
 
            state._consistency = dirstate.DirState.INCONSISTENT
 
675
            state._changes_aborted = True
676
676
            state.save()
677
677
        finally:
678
678
            state.unlock()