← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Aaron Bentley
  • Date: 2005-10-06 03:57:20 UTC
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051006035720-2e50eaeca13837bc
Commit aborts with conflicts in the tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
79
79
from bzrlib.branch import gen_file_id
80
80
from bzrlib.errors import (BzrError, PointlessCommit,
81
81
                           HistoryMissing,
 
82
                           ConflictsInTree
82
83
                           )
83
84
from bzrlib.revision import Revision
84
85
from bzrlib.trace import mutter, note, warning
223
224
                    or self.new_inv != self.basis_inv):
224
225
                raise PointlessCommit()
225
226
 
 
227
            if len(list(self.work_tree.iter_conflicts()))>0:
 
228
                raise ConflictsInTree
 
229
 
226
230
            self._record_inventory()
227
231
            self._record_ancestry()
228
232
            self._make_revision()