← 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-10 21:18:54 UTC
  • mto: This revision was merged to the branch mainline in revision 2606.
  • Revision ID: abentley@panoramicfeedback.com-20070710211854-93ofaa70day2p8d3
Start eliminating the use of None to indicate null revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
22
22
from bzrlib import (
23
23
    osutils,
24
24
    registry,
 
25
    revision as _mod_revision,
25
26
    )
26
27
from bzrlib.branch import Branch
27
28
from bzrlib.conflicts import ConflictList, Conflict
218
219
                                                  self.this_branch)
219
220
        if other_revision[1] == -1:
220
221
            self.other_rev_id = self.other_branch.last_revision()
221
 
            if self.other_rev_id is None:
 
222
            if _mod_revision.is_null(self.other_rev_id):
222
223
                raise NoCommits(self.other_branch)
223
224
            self.other_basis = self.other_rev_id
224
225
        elif other_revision[1] is not None: