/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

Merge cleanup into orphan-non-versioned-files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
814
814
        self.assertIs(None, self.wt.path2id('parent'))
815
815
        self.assertIs(None, self.wt.path2id('parent.new'))
816
816
 
 
817
    def test_resolve_conflicts_missing_parent(self):
 
818
        wt = self.make_branch_and_tree('.')
 
819
        tt = TreeTransform(wt)
 
820
        self.addCleanup(tt.finalize)
 
821
        parent = tt.trans_id_file_id('parent-id')
 
822
        tt.new_file('file', parent, 'Contents')
 
823
        raw_conflicts = resolve_conflicts(tt)
 
824
        self.assertLength(1, raw_conflicts)
 
825
        self.assertEqual(('missing parent', 'Created directory', 'new-1'),
 
826
                         raw_conflicts.pop())
 
827
 
817
828
    def test_moving_versioned_directories(self):
818
829
        create, root = self.get_transform()
819
830
        kansas = create.new_directory('kansas', root, 'kansas-id')
2329
2340
        self.failUnlessExists('a')
2330
2341
        self.failUnlessExists('a/b')
2331
2342
 
2332
 
    def test_resolve_no_parent(self):
2333
 
        wt = self.make_branch_and_tree('.')
2334
 
        tt = TreeTransform(wt)
2335
 
        self.addCleanup(tt.finalize)
2336
 
        parent = tt.trans_id_file_id('parent-id')
2337
 
        tt.new_file('file', parent, 'Contents')
2338
 
        resolve_conflicts(tt)
2339
 
 
2340
2343
 
2341
2344
A_ENTRY = ('a-id', ('a', 'a'), True, (True, True),
2342
2345
                  ('TREE_ROOT', 'TREE_ROOT'), ('a', 'a'), ('file', 'file'),