← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2005-09-20 09:06:51 UTC
  • Revision ID: mbp@sourcefrog.net-20050920090651-b71b6225a863ba91
- disallow selected-file commit of merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
207
207
            self.basis_inv = self.basis_tree.inventory
208
208
 
209
209
            self._gather_parents()
 
210
            if len(self.parents) > 1 and self.specific_files:
 
211
                raise NotImplementedError('selected-file commit of merges is not supported yet')
210
212
            self._check_parents_present()
211
213
            
212
214
            self._remove_deleted()