/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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ignore.py
22
22
import re
23
23
import sys
24
24
 
25
 
from bzrlib import ignores
 
25
from bzrlib import (
 
26
    ignores,
 
27
    osutils,
 
28
    )
26
29
import bzrlib
27
30
from bzrlib.branch import Branch
28
31
import bzrlib.bzrdir as bzrdir
30
33
from bzrlib.osutils import (
31
34
    has_symlinks,
32
35
    pathjoin,
33
 
    rmtree,
34
36
    terminal_width,
35
37
    )
36
38
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
47
49
 
48
50
        # is_ignored() will now create the user global ignore file
49
51
        # if it doesn't exist, so make sure we ignore it in our tests
50
 
        ignores._set_user_ignores(['*.tmp', './.bazaar'])
 
52
        ignores._set_user_ignores(['*.tmp'])
51
53
 
52
54
        self.build_tree_contents(
53
55
            [('foo.tmp', '.tmp files are ignored by default'),