← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/dirstate.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-07 10:36:24 UTC
  • mfrom: (5764 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5766.
  • Revision ID: john@arbash-meinel.com-20110407103624-n76g6tjeqmznwdcd
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/dirstate.py
1745
1745
                self._sha_cutoff_time()
1746
1746
            if (stat_value.st_mtime < self._cutoff_time
1747
1747
                and stat_value.st_ctime < self._cutoff_time):
1748
 
                entry[1][0] = ('f', sha1, entry[1][0][2], entry[1][0][3],
1749
 
                    packed_stat)
 
1748
                entry[1][0] = ('f', sha1, stat_value.st_size, entry[1][0][3],
 
1749
                               packed_stat)
1750
1750
                self._dirblock_state = DirState.IN_MEMORY_MODIFIED
1751
1751
 
1752
1752
    def _sha_cutoff_time(self):