← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
209
209
        if check_clean:
210
210
            self.compare_basis()
211
211
            if self.this_basis != self.this_rev_id:
212
 
                raise BzrCommandError("Working tree has uncommitted changes.")
 
212
                raise errors.UncommittedChanges(self.this_tree)
213
213
 
214
214
    def compare_basis(self):
215
215
        try: