← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: John Arbash Meinel
  • Date: 2011-05-26 08:05:45 UTC
  • mfrom: (5916 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5917.
  • Revision ID: john@arbash-meinel.com-20110526080545-5tprxfczyj4bfk0o
Merge bzr.dev 5916 and make sure the right patch is applied.

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:
 
68
        Tuples may be::
 
69
 
69
70
           ('add file', file_id, work_kind, work_path)
70
71
           ('delete file', file_id, target_kind, target_path)
71
72
           ('rename', file_id, target_path, work_path)