← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
287
287
        # version or the u2 version.
288
288
        self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
289
289
        self.run_bzr('commit', '-m', 'checkin merge of the offline work from u1', 'u1')
 
290
 
 
291
    def test_commit_respects_spec_for_removals(self):
 
292
        """Commit with a file spec should only commit removals that match"""
 
293
        t = self.make_branch_and_tree('.')
 
294
        self.build_tree(['file-a', 'dir-a/', 'dir-a/file-b'])
 
295
        t.add(['file-a', 'dir-a', 'dir-a/file-b'])
 
296
        t.commit('Create')
 
297
        t.remove(['file-a', 'dir-a/file-b'])
 
298
        os.chdir('dir-a')
 
299
        result = self.run_bzr('commit', '.', '-m' 'removed file-b')[1]
 
300
        self.assertNotContainsRe(result, 'file-a')
 
301
        result = self.run_bzr('status')[0]
 
302
        self.assertContainsRe(result, 'removed:\n  file-a')