~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit.py

Merge from mpool.

Show diffs side-by-side

added added

removed removed

Lines of Context:
146
146
        """Test commit of a revision where a file is renamed."""
147
147
        b = Branch.initialize('.')
148
148
        tree = WorkingTree('.', b)
149
 
        self.build_tree(['hello'])
 
149
        self.build_tree(['hello'], line_endings='binary')
150
150
        tree.add(['hello'], ['hello-id'])
151
151
        tree.commit(message='one', rev_id='test@rev-1', allow_pointless=False)
152
152
 
169
169
        ie = tree2.inventory['hello-id']
170
170
        eq(ie.revision, 'test@rev-2')
171
171
 
172
 
 
173
172
    def test_reused_rev_id(self):
174
173
        """Test that a revision id cannot be reused in a branch"""
175
174
        b = Branch.initialize('.')
179
178
                          message='reused id',
180
179
                          rev_id='test@rev-1',
181
180
                          allow_pointless=True)
182
 
                          
183
 
 
184
181
 
185
182
    def test_commit_move(self):
186
183
        """Test commit of revisions with moved files and directories"""