← 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: 2006-05-12 23:48:49 UTC
  • mfrom: (1704.2.13 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060512234849-259ff209fff58489
(mbp) various fixes

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()
511
512
            if ie.revision is None:
512
513
                change = ie.snapshot(self.rev_id, path, previous_entries,
513
514
                                     self.work_tree, self.weave_store,
514
 
                                     self.branch.get_transaction())
 
515
                                     self.branch.repository.get_transaction())
515
516
            else:
516
517
                change = "unchanged"
517
518
            self.reporter.snapshot_change(change, path)