← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-05-21 15:24:46 UTC
  • mfrom: (1551.15.9 Aaron's mergeable stuff)
  • Revision ID: pqm@pqm.ubuntu.com-20070521152446-1v1dk0m7c705cdlx
Better error for selected-file commit of merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
299
299
 
300
300
            self._gather_parents()
301
301
            if len(self.parents) > 1 and self.specific_files:
302
 
                raise NotImplementedError('selected-file commit of merges is not supported yet: files %r',
303
 
                        self.specific_files)
 
302
                raise errors.CannotCommitSelectedFileMerge(self.specific_files)
304
303
            
305
304
            self.builder = self.branch.get_commit_builder(self.parents,
306
305
                self.config, timestamp, timezone, committer, revprops, rev_id)