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

  • Committer: Aaron Bentley
  • Date: 2009-08-18 12:49:22 UTC
  • mfrom: (4624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4630.
  • Revision ID: aaron@aaronbentley.com-20090818124922-amjt054mh5wm0s30
Merge bzr.dev into shelve-lines.

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()
120
121
        tree =self.make_branch_and_tree('.')
121
122
        file('name1', 'wb').write('Hello')
122
123
        tree.add('name1')
127
128
 
128
129
    def test_layered_rename(self):
129
130
        """Rename both child and parent at same time"""
 
131
        self.thisFailsStrictLockCheck()
130
132
        tree =self.make_branch_and_tree('.')
131
133
        os.mkdir('dirname1')
132
134
        tree.add('dirname1')
213
215
        self.assertFileEqual('text2', 'tree/sub-tree/file')
214
216
 
215
217
    def test_merge_with_missing(self):
 
218
        self.thisFailsStrictLockCheck()
216
219
        tree_a = self.make_branch_and_tree('tree_a')
217
220
        self.build_tree_contents([('tree_a/file', 'content_1')])
218
221
        tree_a.add('file')