← 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 04:29:10 UTC
  • mfrom: (1185.14.11)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051006042910-a3263271389bfdc2
Merged conflict handling work

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
235
236
                    or self.new_inv != self.basis_inv):
236
237
                raise PointlessCommit()
237
238
 
 
239
            if len(list(self.work_tree.iter_conflicts()))>0:
 
240
                raise ConflictsInTree
 
241
 
238
242
            self._record_inventory()
239
243
            self._record_ancestry()
240
244
            self._make_revision()