/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

merge bzr.dev r4164

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ignore.py
124
124
        out, err = self.run_bzr('ignore a')
125
125
        self.assertEqual(out,
126
126
                         "Warning: the following files are version controlled"\
127
 
                         " and match your ignore pattern:\na\n")
 
127
                         " and match your ignore pattern:\na\n"\
 
128
                         "These files will continue to be version controlled"\
 
129
                         " unless you 'bzr remove' them.\n")
128
130
 
129
131
        # test a single unversioned file
130
132
        out, err = self.run_bzr('ignore b')
135
137
        out, err = self.run_bzr('ignore *')
136
138
        self.assertEqual(out,
137
139
                         "Warning: the following files are version controlled"\
138
 
                         " and match your ignore pattern:\n.bzrignore\na\nb\n")
 
140
                         " and match your ignore pattern:\n.bzrignore\na\nb\n"\
 
141
                         "These files will continue to be version controlled"\
 
142
                         " unless you 'bzr remove' them.\n")
139
143
 
140
144
    def test_ignored_versioned_file_matching_new_pattern(self):
141
145
        tree = self.make_branch_and_tree('.')
148
152
        out, err = self.run_bzr('ignore b')
149
153
        self.assertEqual(out,
150
154
                         "Warning: the following files are version controlled"\
151
 
                         " and match your ignore pattern:\nb\n")
 
155
                         " and match your ignore pattern:\nb\n"\
 
156
                         "These files will continue to be version controlled"\
 
157
                         " unless you 'bzr remove' them.\n")