/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-03-10 16:10:04 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-20060310161004-8e7c784a0ba225de
Switched display functions to conflict_lines

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
299
299
                    or self.new_inv != self.basis_inv):
300
300
                raise PointlessCommit()
301
301
 
302
 
            if len(list(self.work_tree.iter_conflicts()))>0:
 
302
            if len(list(self.work_tree.conflict_lines()))>0:
303
303
                raise ConflictsInTree
304
304
 
305
305
            self.inv_sha1 = self.branch.repository.add_inventory(