← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-04-26 15:39:04 UTC
  • mfrom: (2456.2.6 rename_iter_changes_109993)
  • Revision ID: pqm@pqm.ubuntu.com-20070426153904-l91p9ybsqpxt2vyv
(John Arbash Meinel) Fix bug #109993 by fixing _iter_changes to not sync an on-disk file with an 'absent' dirblock record.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_move.py
167
167
                               ('d', 'd-id')], tree.basis_tree())
168
168
        tree._validate()
169
169
 
 
170
    def test_move_over_deleted(self):
 
171
        tree = self.make_branch_and_tree('.')
 
172
        self.build_tree(['a/', 'a/b', 'b'])
 
173
        tree.add(['a', 'a/b', 'b'], ['a-id', 'ab-id', 'b-id'])
 
174
        tree.commit('initial', rev_id='rev-1')
 
175
 
 
176
        root_id = tree.get_root_id()
 
177
        tree.remove(['a/b'], keep_files=False)
 
178
        self.assertEqual([('b', 'a/b')], tree.move(['b'], 'a'))
 
179
        self.assertTreeLayout([('', root_id),
 
180
                               ('a', 'a-id'),
 
181
                               ('a/b', 'b-id'),
 
182
                              ], tree)
 
183
        tree._validate()
 
184
 
170
185
    def test_move_subdir(self):
171
186
        tree = self.make_branch_and_tree('.')
172
187
        self.build_tree(['a', 'b/', 'b/c'])