← 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: 2008-08-14 21:14:26 UTC
  • mfrom: (3634.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080814211426-i0rmbyhjxf4hi7pt
(jam)(trivial) NEWS fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
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)