/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2006-06-27 00:52:14 UTC
  • mto: (1711.2.66 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1819.
  • Revision ID: jelmer@samba.org-20060627005214-ada07acfa15484b7
Catch right exception to detect pending-merges file is missing.

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():