/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

Detect duplicate inventory ids

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
144
144
            fp = FinalPaths(transform2._new_root, transform2)
145
145
            self.assert_('oz/tip' in transform2._tree_path_ids)
146
146
            self.assertEqual(fp.get_path(newtip), 'oz/tip')
147
 
            self.assertEqual(len(result), 1)
 
147
            self.assertEqual(len(result), 2)
148
148
            self.assertEqual((result[0][0], result[0][1]), 
149
149
                             ('duplicate', newtip))
 
150
            self.assertEqual((result[1][0], result[1][2]), 
 
151
                             ('duplicate id', newtip))
150
152
        finally:
151
153
            transform2.finalize()
152
154
        transform3 = TreeTransform(wt)
271
273
        finally:
272
274
            move_id.finalize()
273
275
        
 
276
    def test_replace_dangling_ie(self):
 
277
        branch = Branch.initialize('.')
 
278
        wt = branch.working_tree()
 
279
        create_tree = TreeTransform(wt)
 
280
        try:
 
281
            # prepare tree
 
282
            root = create_tree.get_id_tree('TREE_ROOT')
 
283
            create_tree.new_file('name1', root, 'hello1', 'name1')
 
284
            create_tree.apply()
 
285
        finally:
 
286
            create_tree.finalize()
 
287
        delete_contents = TreeTransform(wt)
 
288
        try:
 
289
            file = delete_contents.get_id_tree('name1')
 
290
            delete_contents.delete_contents(file)
 
291
            delete_contents.apply()
 
292
        finally:
 
293
            delete_contents.finalize()
 
294
        replace = TreeTransform(wt)
 
295
        try:
 
296
            name2 = replace.new_file('name2', root, 'hello2', 'name1')
 
297
            conflicts = replace.find_conflicts()
 
298
            name1 = replace.get_id_tree('name1')
 
299
            self.assertEqual(conflicts, [('duplicate id', name1, name2)])
 
300
            replace.unversion_file(name1)
 
301
            replace.apply()
 
302
        finally:
 
303
            replace.finalize()
274
304
 
275
305
    def test_symlinks(self):
276
306
        if not has_symlinks():