← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-07 06:08:01 UTC
  • mto: This revision was merged to the branch mainline in revision 5491.
  • Revision ID: v.ladeuil+lp@free.fr-20101007060801-wfdhizfhfmctl8qa
Fix some typos and propose a release planning.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
65
65
        """Iterable of tuples describing shelvable changes.
66
66
 
67
67
        As well as generating the tuples, this updates several members.
68
 
        Tuples may be::
69
 
 
 
68
        Tuples may be:
70
69
           ('add file', file_id, work_kind, work_path)
71
70
           ('delete file', file_id, target_kind, target_path)
72
71
           ('rename', file_id, target_path, work_path)
82
81
            # when a tree root was deleted / renamed.
83
82
            if kind[0] is None and names[1] == '':
84
83
                continue
85
 
            # Also don't shelve deletion of tree root.
86
 
            if kind[1] is None and names[0] == '':
87
 
                continue
88
84
            if kind[0] is None or versioned[0] == False:
89
85
                self.creation[file_id] = (kind[1], names[1], parents[1],
90
86
                                          versioned)