/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/tests/test_remote.py

  • Committer: Vincent Ladeuil
  • Date: 2011-12-19 16:41:49 UTC
  • mfrom: (6386 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6387.
  • Revision ID: v.ladeuil+lp@free.fr-20111219164149-ecfrvwscqb6v77jn
Merge trunk to resolve news conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
175
175
    def test_remote_branch_set_append_revisions_only(self):
176
176
        # Make a format 1.9 branch, which supports append_revisions_only
177
177
        branch = self.make_branch('branch', format='1.9')
178
 
        config = branch.get_config()
179
178
        branch.set_append_revisions_only(True)
 
179
        config = branch.get_config_stack()
180
180
        self.assertEqual(
181
 
            'True', config.get_user_option('append_revisions_only'))
 
181
            True, config.get('append_revisions_only'))
182
182
        branch.set_append_revisions_only(False)
 
183
        config = branch.get_config_stack()
183
184
        self.assertEqual(
184
 
            'False', config.get_user_option('append_revisions_only'))
 
185
            False, config.get('append_revisions_only'))
185
186
 
186
187
    def test_remote_branch_set_append_revisions_only_upgrade_reqd(self):
187
188
        branch = self.make_branch('branch', format='knit')
188
 
        config = branch.get_config()
189
189
        self.assertRaises(
190
190
            errors.UpgradeRequired, branch.set_append_revisions_only, True)
191
191