← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Fixed deletion handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
150
150
        oz_id = transform2.get_id_tree('oz-id')
151
151
        newtip = transform2.new_file('tip', oz_id, 'other', 'tip-id')
152
152
        result = transform2.find_conflicts()
153
 
        fp = FinalPaths(transform2._new_root, transform2)
 
153
        fp = FinalPaths(transform2)
154
154
        self.assert_('oz/tip' in transform2._tree_path_ids)
155
155
        self.assertEqual(fp.get_path(newtip), os.path.join('oz', 'tip'))
156
156
        self.assertEqual(len(result), 2)