/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: John Arbash Meinel
  • Date: 2007-11-30 22:40:29 UTC
  • mfrom: (3060.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 3063.
  • Revision ID: john@arbash-meinel.com-20071130224029-bpqrx0fjkify8w8p
Merge in bzr.dev and updated NEWS for post 1.0rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1903
1903
                     kind, executable) in self._iter_changes(self.basis_tree(),
1904
1904
                         include_unchanged=True, require_versioned=False,
1905
1905
                         want_unversioned=True, specific_files=files):
1906
 
                    # Check if it's an unknown (but not ignored) OR
1907
 
                    # changed (but not deleted) :
1908
 
                    if ((versioned == (False, False) or
1909
 
                         content_change and kind[1] != None)
1910
 
                        and not self.is_ignored(path[1])):
 
1906
                    if versioned == (False, False):
 
1907
                        # The record is unknown ...
 
1908
                        if not self.is_ignored(path[1]):
 
1909
                            # ... but not ignored
 
1910
                            has_changed_files = True
 
1911
                            break
 
1912
                    elif content_change and (kind[1] != None):
 
1913
                        # Versioned and changed, but not deleted
1911
1914
                        has_changed_files = True
1912
1915
                        break
1913
1916