/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2007-07-11 16:42:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2606.
  • Revision ID: abentley@panoramicfeedback.com-20070711164237-n1x38fz7fttybkqp
Push NULL_REVISION deeper

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
282
282
            if base_revision[1] == -1:
283
283
                self.base_rev_id = base_branch.last_revision()
284
284
            elif base_revision[1] is None:
285
 
                self.base_rev_id = None
 
285
                self.base_rev_id = _mod_revision.NULL_REVISION
286
286
            else:
287
 
                self.base_rev_id = base_branch.get_rev_id(base_revision[1])
 
287
                self.base_rev_id = _mod_revision.ensure_null(
 
288
                    base_branch.get_rev_id(base_revision[1]))
288
289
            if self.this_branch.base != base_branch.base:
289
290
                self.this_branch.fetch(base_branch)
290
291
            self.base_is_ancestor = is_ancestor(self.this_basis,