← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/index.py

  • Committer: John Arbash Meinel
  • Date: 2008-10-28 17:43:41 UTC
  • mfrom: (3789.1.11 pack_retry_153786-1)
  • mto: This revision was merged to the branch mainline in revision 3913.
  • Revision ID: john@arbash-meinel.com-20081028174341-0k5jodd44m9llx7w
Merge the 153786-1 fixes branch and resolve NEWS again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/index.py
1280
1280
        if self._reload_func is None:
1281
1281
            raise
1282
1282
        exc_type, exc_value, exc_traceback = sys.exc_info()
 
1283
        trace.mutter('Trying to reload after getting exception: %s',
 
1284
                     exc_value)
1283
1285
        if not self._reload_func():
1284
1286
            # We tried to reload, but nothing changed, so we fail anyway
 
1287
            trace.mutter('_reload_func indicated nothing has changed.'
 
1288
                         ' Raising original exception.')
1285
1289
            raise exc_type, exc_value, exc_traceback
1286
1290
 
1287
1291
    def validate(self):