← 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: Andrew Bennetts
  • Date: 2009-08-25 01:25:57 UTC
  • mfrom: (4642 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4657.
  • Revision ID: andrew.bennetts@canonical.com-20090825012557-1ku5o09nv3ra9n12
Merge from bzr.dev.

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')