~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-06 23:38:33 UTC
  • mfrom: (6463 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6464.
  • Revision ID: jelmer@samba.org-20120206233833-w0nbclw7d1xj4twj
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
372
372
        elif self.reporter is None:
373
373
            self.reporter = self._select_reporter()
374
374
        if self.config_stack is None:
375
 
            self.config_stack = self.branch.get_config_stack()
 
375
            self.config_stack = self.work_tree.get_config_stack()
376
376
 
377
377
        self._set_specific_file_ids()
378
378