← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1316
1316
                only_change_inv = True
1317
1317
            elif self.has_filename(from_rel) and not self.has_filename(to_rel):
1318
1318
                only_change_inv = False
1319
 
            elif (sys.platform == 'win32'
1320
 
                and from_rel.lower() == to_rel.lower()
1321
 
                and self.has_filename(from_rel)):
 
1319
            elif (not self.case_sensitive
 
1320
                  and from_rel.lower() == to_rel.lower()
 
1321
                  and self.has_filename(from_rel)):
1322
1322
                only_change_inv = False
1323
1323
            else:
1324
1324
                # something is wrong, so lets determine what exactly