/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_transform.py

  • Committer: James Westby
  • Date: 2008-07-31 19:38:13 UTC
  • mto: This revision was merged to the branch mainline in revision 3609.
  • Revision ID: jw+debian@jameswestby.net-20080731193813-z0u37e3l0j6u0xyj
Make ->file changes work as well.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1241
1241
        self.assertFalse(changes.has_changed(), changes)
1242
1242
 
1243
1243
    def test_file_to_symlink(self):
 
1244
        self.requireFeature(SymlinkFeature)
1244
1245
        wt = self.make_branch_and_tree('.')
1245
1246
        self.build_tree(['foo'])
1246
1247
        wt.add(['foo'])
1257
1258
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
1258
1259
                "symlink")
1259
1260
 
 
1261
    def test_dir_to_file(self):
 
1262
        wt = self.make_branch_and_tree('.')
 
1263
        self.build_tree(['foo/', 'foo/bar'])
 
1264
        wt.add(['foo', 'foo/bar'])
 
1265
        wt.commit("one")
 
1266
        tt = TreeTransform(wt)
 
1267
        self.addCleanup(tt.finalize)
 
1268
        foo_trans_id = tt.trans_id_tree_path("foo")
 
1269
        bar_trans_id = tt.trans_id_tree_path("foo/bar")
 
1270
        tt.delete_contents(foo_trans_id)
 
1271
        tt.delete_versioned(bar_trans_id)
 
1272
        tt.create_file(["aa\n"], foo_trans_id)
 
1273
        tt.apply()
 
1274
        self.failUnlessExists("foo")
 
1275
        wt.lock_read()
 
1276
        self.addCleanup(wt.unlock)
 
1277
        self.assertEqual(wt.inventory.get_file_kind(wt.path2id("foo")),
 
1278
                "file")
 
1279
 
1260
1280
 
1261
1281
class TransformGroup(object):
1262
1282