/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: John Arbash Meinel
  • Date: 2008-09-10 17:33:01 UTC
  • mfrom: (3698 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3701.
  • Revision ID: john@arbash-meinel.com-20080910173301-niz0pw3mcat430o1
Merge in bzr.dev 3698

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(None)))
 
1113
                    self.branch.repository.revision_tree(
 
1114
                        _mod_revision.NULL_REVISION)))
1114
1115
                ghosts.append(rev_id)
1115
1116
            accepted_revisions.add(rev_id)
1116
1117
        dirstate.set_parent_trees(real_trees, ghosts=ghosts)