← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Jelmer Vernooij
  • Date: 2011-06-16 11:57:36 UTC
  • mto: This revision was merged to the branch mainline in revision 5987.
  • Revision ID: jelmer@samba.org-20110616115736-5xuzwdf87qb81su4
Use iter_ancestry rather than get_ancestry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
82
82
            # when a tree root was deleted / renamed.
83
83
            if kind[0] is None and names[1] == '':
84
84
                continue
85
 
            # Also don't shelve deletion of tree root.
86
 
            if kind[1] is None and names[0] == '':
87
 
                continue
88
85
            if kind[0] is None or versioned[0] == False:
89
86
                self.creation[file_id] = (kind[1], names[1], parents[1],
90
87
                                          versioned)