← 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: 2007-07-11 19:44:51 UTC
  • mto: This revision was merged to the branch mainline in revision 2606.
  • Revision ID: abentley@panoramicfeedback.com-20070711194451-3jqhye1nnd02a9uv
Restore original Branch.last_revision behavior, fix bits that care

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
104
104
        object.__init__(self)
105
105
        assert this_tree is not None, "this_tree is required"
106
106
        self.this_branch = this_branch
107
 
        self.this_basis = this_branch.last_revision()
 
107
        self.this_basis = _mod_revision.ensure_null(
 
108
            this_branch.last_revision())
108
109
        self.this_rev_id = None
109
110
        self.this_tree = this_tree
110
111
        self.this_revision_tree = None
218
219
        self.other_branch, self.other_tree = _get_tree(other_revision,
219
220
                                                  self.this_branch)
220
221
        if other_revision[1] == -1:
221
 
            self.other_rev_id = self.other_branch.last_revision()
 
222
            self.other_rev_id = _mod_revision.ensure_null(
 
223
                self.other_branch.last_revision())
222
224
            if _mod_revision.is_null(self.other_rev_id):
223
225
                raise NoCommits(self.other_branch)
224
226
            self.other_basis = self.other_rev_id