← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/workingtree_implementations/test_commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-20 22:23:07 UTC
  • mfrom: (2363.2.5 dirstate_93681)
  • Revision ID: pqm@pqm.ubuntu.com-20070320222307-30c846e90ac18c65
(John Arbash Meinel) fix bug #93681 by not calling _make_absent for removed entries.

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_removed(self):
 
203
        wt = self.make_branch_and_tree('.')
 
204
        self.build_tree(['a', 'b/', 'b/c', 'd'])
 
205
        wt.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
 
206
        wt.commit('first')
 
207
        wt.remove('b/c')
 
208
        this_dir = self.get_transport()
 
209
        this_dir.delete_tree('b')
 
210
        wt.lock_write()
 
211
        wt.commit('commit deleted rename')
 
212
        self.assertTrue(wt.has_id('a-id'))
 
213
        self.assertFalse(wt.has_or_had_id('b-id'))
 
214
        self.assertFalse(wt.has_or_had_id('c-id'))
 
215
        self.assertTrue(wt.has_filename('a'))
 
216
        self.assertFalse(wt.has_filename('b'))
 
217
        self.assertFalse(wt.has_filename('b/c'))
 
218
        wt.unlock()
 
219
 
202
220
    def test_commit_move_new(self):
203
221
        wt = self.make_branch_and_tree('first')
204
222
        wt.commit('first')