/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

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1318
1318
                only_change_inv = True
1319
1319
            elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1320
1320
                only_change_inv = False
 
1321
            elif (sys.platform == 'win32'
 
1322
                and from_rel.lower() == to_rel.lower()
 
1323
                and self.has_filename(from_rel)):
 
1324
                only_change_inv = False
1321
1325
            else:
1322
1326
                # something is wrong, so lets determine what exactly
1323
1327
                if not self.has_filename(from_rel) and \
1891
1895
                         want_unversioned=True, specific_files=files):
1892
1896
                    # Check if it's an unknown (but not ignored) OR
1893
1897
                    # 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):
 
1898
                    if ((versioned == (False, False) or
 
1899
                         content_change and kind[1] != None)
 
1900
                        and not self.is_ignored(path[1])):
1897
1901
                        has_changed_files = True
1898
1902
                        break
1899
1903