/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/blackbox/test_ignore.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ignore.py
156
156
                         " and match your ignore pattern:\nb\n"\
157
157
                         "These files will continue to be version controlled"\
158
158
                         " unless you 'bzr remove' them.\n")
 
159
 
 
160
    def test_ignore_directory(self):
 
161
        """Test --directory option"""
 
162
        tree = self.make_branch_and_tree('a')
 
163
        self.run_bzr(['ignore', '--directory=a', 'README'])
 
164
        self.check_file_contents('a/.bzrignore', 'README\n')