/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/dirstate.py

  • Committer: Aaron Bentley
  • Date: 2009-03-11 01:53:16 UTC
  • mto: This revision was merged to the branch mainline in revision 4112.
  • Revision ID: aaron@aaronbentley.com-20090311015316-r02ln95zzlimfdh2
Stop resetting minikind to 'd' when comparing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
2807
2807
    (saved_minikind, saved_link_or_sha1, saved_file_size,
2808
2808
     saved_executable, saved_packed_stat) = entry[1][0]
2809
2809
 
 
2810
    if minikind == 'd' and saved_minikind == 't':
 
2811
        minikind = 't'
2810
2812
    if (minikind == saved_minikind
2811
2813
        and packed_stat == saved_packed_stat):
2812
2814
        # The stat hasn't changed since we saved, so we can re-use the