← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-17 01:48:03 UTC
  • mfrom: (2967.5.13 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20071117014803-umq9bksvua0zmpts
(Daniel Watkins) 'bzr rm already-deleted' should not traceback

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