/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: Vincent Ladeuil
  • Date: 2008-08-26 13:13:30 UTC
  • mto: (3668.1.1 trunk) (3703.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3669.
  • Revision ID: v.ladeuil+lp@free.fr-20080826131330-xgh1m6v9i2636jw0
OSX too needs to accept 'bzr mv foo Foo' when foo and Foo are the same file.

* bzrlib/workingtree.py:
(WorkingTree._determine_mv_mode): Case sensitivity is what matter
here, it exists outside of win32 (i.e. OSX).

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