/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/workingtree_4.py

  • Committer: Aaron Bentley
  • Date: 2007-07-11 14:58:54 UTC
  • mto: This revision was merged to the branch mainline in revision 2606.
  • Revision ID: abentley@panoramicfeedback.com-20070711145854-06486yosdvexapy1
Got all tests passing with Branch returning 'null:' for 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: