~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-06-28 11:39:48 UTC
  • mfrom: (5993.1.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20110628113948-nrljydmsqi6kf01c
(vila) Start implementing command help text localization (Inada Naoki)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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)