← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Patch Queue Manager
  • Date: 2011-11-08 19:35:23 UTC
  • mfrom: (6241.3.2 workingtree-clone-null)
  • Revision ID: pqm@pqm.ubuntu.com-20111108193523-3pn06vmmw2508tsj
(jelmer) Support 'null:' revision for WorkingTree.clone(). (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
522
522
            # TODO now merge from tree.last_revision to revision (to preserve
523
523
            # user local changes)
524
524
            merge.transform_tree(tree, self)
525
 
            tree.set_parent_ids([revision_id])
 
525
            if revision_id == _mod_revision.NULL_REVISION:
 
526
                new_parents = []
 
527
            else:
 
528
                new_parents = [revision_id]
 
529
            tree.set_parent_ids(new_parents)
526
530
 
527
531
    def id2abspath(self, file_id):
528
532
        return self.abspath(self.id2path(file_id))