/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/commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-20 03:50:35 UTC
  • mfrom: (1740.5.9 bzr.mbp.traceback)
  • Revision ID: pqm@pqm.ubuntu.com-20060620035035-a9a7dc096fed5060
(mbp) show traceback on stderr on unexpected errors

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
import bzrlib.config
76
76
import bzrlib.errors as errors
77
77
from bzrlib.errors import (BzrError, PointlessCommit,
78
 
                           HistoryMissing,
79
78
                           ConflictsInTree,
80
79
                           StrictCommitFailed
81
80
                           )
457
456
            if not self.branch.repository.has_revision(parent_id):
458
457
                if parent_id == self.branch.last_revision():
459
458
                    warning("parent is missing %r", parent_id)
460
 
                    raise HistoryMissing(self.branch, 'revision', parent_id)
461
 
                else:
462
 
                    mutter("commit will ghost revision %r", parent_id)
 
459
                    raise BzrCheckError("branch %s is missing revision {%s}"
 
460
                            % (self.branch, parent_id))
463
461
            
464
462
    def _remove_deleted(self):
465
463
        """Remove deleted files from the working inventories.