/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: John Arbash Meinel
  • Date: 2007-06-01 21:40:45 UTC
  • mfrom: (2501 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2503.
  • Revision ID: john@arbash-meinel.com-20070601214045-zalht5mx39yg11l6
[merge] bzr.dev 2501

Show diffs side-by-side

added added

removed removed

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