← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-28 14:06:50 UTC
  • mfrom: (1711.2.66 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060628140650-135f9ed05d63075c
(jelmer) fix pending-merge exception checking

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
656
656
        """
657
657
        try:
658
658
            merges_file = self._control_files.get_utf8('pending-merges')
659
 
        except OSError, e:
660
 
            if e.errno != errno.ENOENT:
661
 
                raise
 
659
        except NoSuchFile:
662
660
            return []
663
661
        p = []
664
662
        for l in merges_file.readlines():