~bzr-pqm/bzr/bzr.dev

Committer: John Arbash Meinel
Date: 2011-04-05 12:52:10 UTC
mto: This revision was merged to the branch mainline in revision 5759.
Revision ID: john@arbash-meinel.com-20110405125210-jau8vc9mfhp59gzp

Change WT._observed_sha1 to also update st.st_size.

The 'is this file up-to-date' check includes st_size as a field
it wants to be exact. We happened to set this as a side effect
of bzr commit, but it wasn't being done in _observed_sha1.

files modified:
bzrlib/dirstate.py

bzrlib/tests/test_workingtree_4.py

doc/en/release-notes/bzr-2.4.txt

Show diffs side-by-side

added added

removed removed

bzrlib/dirstate.py

1734

self._sha_cutoff_time()

1735

if (stat_value.st_mtime < self._cutoff_time

1736

and stat_value.st_ctime < self._cutoff_time):

1737

entry[1][0] = ('f', sha1, entry[1][0][2], entry[1][0][3],

1738

packed_stat)

1737

entry[1][0] = ('f', sha1, stat_value.st_size, entry[1][0][3],

1738

packed_stat)

1739

self._dirblock_state = DirState.IN_MEMORY_MODIFIED

1740

1741

def _sha_cutoff_time(self):

Older »