← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Merge bzr.dev

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.iter_conflicts()))>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(