/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/per_workingtree/test_rename_one.py

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 05:24:02 UTC
  • mfrom: (4570 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4573.
  • Revision ID: andrew.bennetts@canonical.com-20090727052402-e3vakc2pnq0y66gm
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_rename_one.py
220
220
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
221
221
                              tree.basis_tree())
222
222
 
 
223
    def test_rename_one_after_source_removed(self):
 
224
        """Rename even if the source was removed from the inventory already"""
 
225
        tree = self.make_branch_and_tree('.')
 
226
        self.build_tree(['a', 'b/'])
 
227
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
228
        tree.commit('initial', rev_id='rev-1')
 
229
        root_id = tree.get_root_id()
 
230
        os.rename('a', 'b/foo')
 
231
        tree.remove(['a'])
 
232
 
 
233
        self.assertTreeLayout([('', root_id), ('b', 'b-id')], tree)
 
234
        # We don't need after=True as long as source is missing and target
 
235
        # exists.
 
236
        tree.rename_one('a', 'b/foo')
 
237
        self.assertTreeLayout([('', root_id), ('b', 'b-id'),
 
238
                               ('b/foo', 'a-id')], tree)
 
239
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id')],
 
240
                              tree.basis_tree())
 
241
 
223
242
    def test_rename_one_after_no_target(self):
224
243
        tree = self.make_branch_and_tree('.')
225
244
        self.build_tree(['a', 'b/'])