← 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: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 16:25:28 UTC
  • mfrom: (5020.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210162528-00g29u0ex6vzv914
(gerard) Update performs two merges in a more logical order but stop
        on conflicts

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.launchpad.net/bzr/+bug/391411>
 
200
        See discussion in <https://bugs.edge.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')