/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/workingtree_implementations/test_commit.py

  • Committer: John Arbash Meinel
  • Date: 2007-03-20 00:49:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2366.
  • Revision ID: john@arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
Simplify the test even further....
Basically, if you have a file deleted as removed, and then you unversion its directory
it deletes all records in the dirblock, not realizing that some of them might
already be marked as removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_commit.py
199
199
        self.assertFalse(wt.has_filename('d'))
200
200
        wt.unlock()
201
201
 
202
 
    def test_commit_deleted_subtree_with_rename(self):
 
202
    def test_commit_deleted_subtree_with_removed(self):
203
203
        wt = self.make_branch_and_tree('.')
204
204
        self.build_tree(['a', 'b/', 'b/c', 'd'])
205
205
        wt.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
206
206
        wt.commit('first')
207
 
        wt.rename_one('b/c', 'b/d')
 
207
        wt.remove('b/c')
208
208
        this_dir = self.get_transport()
209
209
        this_dir.delete_tree('b')
210
210
        wt.lock_write()
215
215
        self.assertTrue(wt.has_filename('a'))
216
216
        self.assertFalse(wt.has_filename('b'))
217
217
        self.assertFalse(wt.has_filename('b/c'))
218
 
        self.assertFalse(wt.has_filename('b/d'))
219
218
        wt.unlock()
220
219
 
221
220
    def test_commit_move_new(self):