~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1110
1110
                real_trees.append((rev_id, tree))
1111
1111
            else:
1112
1112
                real_trees.append((rev_id,
1113
 
                    self.branch.repository.revision_tree(
1114
 
                        _mod_revision.NULL_REVISION)))
 
1113
                    self.branch.repository.revision_tree(None)))
1115
1114
                ghosts.append(rev_id)
1116
1115
            accepted_revisions.add(rev_id)
1117
1116
        dirstate.set_parent_trees(real_trees, ghosts=ghosts)