← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_push.py
676
676
    def set_config_push_strict(self, value):
677
677
        # set config var (any of bazaar.conf, locations.conf, branch.conf
678
678
        # should do)
679
 
        conf = self.tree.branch.get_config_stack()
680
 
        conf.set('push_strict', value)
 
679
        conf = self.tree.branch.get_config()
 
680
        conf.set_user_option('push_strict', value)
681
681
 
682
682
    _default_command = ['push', '../to']
683
683
    _default_wd = 'local'