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

  • Committer: Aaron Bentley
  • Date: 2007-11-18 18:43:35 UTC
  • mfrom: (3006 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3011.
  • Revision ID: aaron.bentley@utoronto.ca-20071118184335-rjptgedxv4357lna
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1891
1891
                         want_unversioned=True, specific_files=files):
1892
1892
                    # Check if it's an unknown (but not ignored) OR
1893
1893
                    # changed (but not deleted) :
1894
 
                    if not self.is_ignored(path[1]) and (
1895
 
                        versioned == (False, False) or
1896
 
                        content_change and kind[1] != None):
 
1894
                    if ((versioned == (False, False) or
 
1895
                         content_change and kind[1] != None)
 
1896
                        and not self.is_ignored(path[1])):
1897
1897
                        has_changed_files = True
1898
1898
                        break
1899
1899