← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2010-09-17 04:35:23 UTC
  • mfrom: (5050.17.20 2.2)
  • mto: This revision was merged to the branch mainline in revision 5431.
  • Revision ID: andrew.bennetts@canonical.com-20100917043523-c5t63gmvxqxmqh5j
Merge lp:bzr/2.2, including fixes for #625574, #636930, #254278.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_reconfigure.py
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')