← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2006-05-15 14:16:44 UTC
  • mto: (1185.82.108 w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: abentley@panoramicfeedback.com-20060515141644-121f7718a83d0049
Switch to merge_changeset in test suite

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
137
137
        trees = (self.this_basis_tree, self.other_tree)
138
138
        return [get_id(tree, file_id) for tree in trees]
139
139
 
140
 
    def check_basis(self, check_clean):
141
 
        if self.this_basis is None:
 
140
    def check_basis(self, check_clean, require_commits=True):
 
141
        if self.this_basis is None and require_commits is True:
142
142
            raise BzrCommandError("This branch has no commits")
143
143
        if check_clean:
144
144
            self.compare_basis()