← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-06 02:23:37 UTC
  • mfrom: (4332.3.36 check)
  • Revision ID: pqm@pqm.ubuntu.com-20090806022337-7c2oni07fsjq6gun
(robertc) Partial overhaul of check to do less duplicate work.
        (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
117
117
 
118
118
    def test_create_rename(self):
119
119
        """Rename an inventory entry while creating the file"""
120
 
        self.thisFailsStrictLockCheck()
121
120
        tree =self.make_branch_and_tree('.')
122
121
        file('name1', 'wb').write('Hello')
123
122
        tree.add('name1')
128
127
 
129
128
    def test_layered_rename(self):
130
129
        """Rename both child and parent at same time"""
131
 
        self.thisFailsStrictLockCheck()
132
130
        tree =self.make_branch_and_tree('.')
133
131
        os.mkdir('dirname1')
134
132
        tree.add('dirname1')
215
213
        self.assertFileEqual('text2', 'tree/sub-tree/file')
216
214
 
217
215
    def test_merge_with_missing(self):
218
 
        self.thisFailsStrictLockCheck()
219
216
        tree_a = self.make_branch_and_tree('tree_a')
220
217
        self.build_tree_contents([('tree_a/file', 'content_1')])
221
218
        tree_a.add('file')