/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/blackbox/test_reconfigure.py

  • Committer: Gordon Tyler
  • Date: 2011-09-09 12:42:32 UTC
  • mto: (6015.33.4 2.4)
  • mto: This revision was merged to the branch mainline in revision 6134.
  • Revision ID: gordon@doxxx.net-20110909124232-ip0bgx4tx6y5fya6
https://launchpad.net/bugs/828803
Use get_user_option in get_merge_tools so that quoted values are correctly unquoted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconfigure.py
131
131
        tree.add('foo')
132
132
        self.run_bzr('reconfigure --with-no-trees --force',
133
133
            working_dir='repo/branch')
134
 
        self.failUnlessExists('repo/branch/foo')
 
134
        self.assertPathExists('repo/branch/foo')
135
135
        tree = workingtree.WorkingTree.open('repo/branch')
136
136
 
137
137
    def test_shared_format_to_standalone(self, format=None):
197
197
         * then make the second unstacked, so it has to fill in history from
198
198
           the original fallback lying underneath its original content
199
199
 
200
 
        See discussion in <https://bugs.edge.launchpad.net/bzr/+bug/391411>
 
200
        See discussion in <https://bugs.launchpad.net/bzr/+bug/391411>
201
201
        """
202
202
        # there are also per_branch tests that exercise remote operation etc
203
203
        tree_1 = self.make_branch_and_tree('b1', format='2a')