← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hashcache.py

  • Committer: Aaron Bentley
  • Date: 2005-08-11 19:54:55 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: abentley@panoramicfeedback.com-20050811195455-91f52bb566728ac7
Fixed spurious new_contents_conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hashcache.py
222
222
            inf = file(fn, 'rb', buffering=65000)
223
223
        except IOError, e:
224
224
            mutter("failed to open %s: %s" % (fn, e))
225
 
            # better write it now so it is valid
226
 
            self.needs_write = True
227
225
            return
228
226
 
229
227
 
231
229
        if hdr != CACHE_HEADER:
232
230
            mutter('cache header marker not found at top of %s; discarding cache'
233
231
                   % fn)
234
 
            self.needs_write = True
235
232
            return
236
233
 
237
234
        for l in inf: