← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_dpush.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_dpush.py
146
146
    def set_config_push_strict(self, value):
147
147
        # set config var (any of bazaar.conf, locations.conf, branch.conf
148
148
        # should do)
149
 
        conf = self.tree.branch.get_config()
150
 
        conf.set_user_option('dpush_strict', value)
 
149
        conf = self.tree.branch.get_config_stack()
 
150
        conf.set('dpush_strict', value)
151
151
 
152
152
    _default_command = ['dpush', '../to']
153
153