~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Aaron Bentley
  • Date: 2009-07-13 17:41:20 UTC
  • mfrom: (4526.7.3 apply-vocab)
  • mto: This revision was merged to the branch mainline in revision 4534.
  • Revision ID: aaron@aaronbentley.com-20090713174120-nadbu8ga31mp6nfl
Merged apply-vocab into merge-interactive.

Show diffs side-by-side

added added

removed removed

Lines of Context:
108
108
            self.shelve_content_change(change[1])
109
109
        elif change[0] == 'modify target':
110
110
            self.shelve_modify_target(change[1])
 
111
        else:
 
112
            raise ValueError('Unknown change kind: "%s"' % change[0])
111
113
 
112
114
    def shelve_rename(self, file_id):
113
115
        """Shelve a file rename.