/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: Aaron Bentley
  • Date: 2006-04-05 18:05:15 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060405180515-4be2a622206de1f7
Got ConflictList implemented

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
309
309
                    or self.new_inv != self.basis_inv):
310
310
                raise PointlessCommit()
311
311
 
312
 
            if len(list(self.work_tree.conflict_lines()))>0:
 
312
            if len(self.work_tree.conflicts())>0:
313
313
                raise ConflictsInTree
314
314
 
315
315
            self.inv_sha1 = self.branch.repository.add_inventory(