← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.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/builtins.py
44
44
    osutils,
45
45
    registry,
46
46
    repository,
 
47
    revision as _mod_revision,
47
48
    revisionspec,
48
49
    symbol_versioning,
49
50
    transport,
1011
1012
        try:
1012
1013
            existing_pending_merges = tree.get_parent_ids()[1:]
1013
1014
            last_rev = tree.last_revision()
 
1015
            if last_rev is None:
 
1016
                last_rev = _mod_revision.NULL_REVISION
1014
1017
            if last_rev == tree.branch.last_revision():
1015
1018
                # may be up to date, check master too.
1016
1019
                master = tree.branch.get_master_branch()