~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 22:36:23 UTC
  • mfrom: (4953 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4955.
  • Revision ID: john@arbash-meinel.com-20100112223623-836x5mou0gm5vsep
merge bzr.dev 4953 to clean up the ui factory issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
    osutils,
26
26
    patiencediff,
27
27
    progress,
28
 
    registry,
29
28
    revision as _mod_revision,
30
29
    textfile,
31
30
    trace,
240
239
        if self.other_rev_id is None:
241
240
            other_basis_tree = self.revision_tree(self.other_basis)
242
241
            if other_basis_tree.has_changes(self.other_tree):
243
 
                raise WorkingTreeNotRevision(self.this_tree)
 
242
                raise errors.WorkingTreeNotRevision(self.this_tree)
244
243
            other_rev_id = self.other_basis
245
244
            self.other_tree = other_basis_tree
246
245