← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-07-12 09:49:37 UTC
  • mfrom: (2598.5.9 nullrevision)
  • Revision ID: pqm@pqm.ubuntu.com-20070712094937-rw5qbi81enh0pvhw
Make most functions prefer NULL_REVISION

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
52
52
    ignores,
53
53
    merge,
54
54
    osutils,
 
55
    revision as _mod_revision,
55
56
    revisiontree,
56
57
    textui,
57
58
    transform,
1089
1090
        # missing on access.
1090
1091
        for rev_id, tree in parents_list:
1091
1092
            rev_id = osutils.safe_revision_id(rev_id)
 
1093
            _mod_revision.check_not_reserved_id(rev_id)
1092
1094
            if tree is not None:
1093
1095
                real_trees.append((rev_id, tree))
1094
1096
            else: