← 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: 2006-05-10 11:19:13 UTC
  • mto: This revision was merged to the branch mainline in revision 1707.
  • Revision ID: mbp@sourcefrog.net-20060510111913-bcbec46d0753610e
Handle 'bzr commit DIR' when dir contains pending merges.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
296
296
 
297
297
            self._gather_parents()
298
298
            if len(self.parents) > 1 and self.specific_files:
299
 
                raise NotImplementedError('selected-file commit of merges is not supported yet')
 
299
                raise NotImplementedError('selected-file commit of merges is not supported yet: files %r',
 
300
                        self.specific_files)
300
301
            self._check_parents_present()
301
302
            
302
303
            self._remove_deleted()