/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: John Arbash Meinel
  • Date: 2011-01-25 22:54:08 UTC
  • mto: This revision was merged to the branch mainline in revision 5636.
  • Revision ID: john@arbash-meinel.com-20110125225408-w5b5mmh117q4jjz1
Implement a reset-to-known-state ability for DirState.

Use this in reset_state(). Allow it to use header information if it can
be parsed, otherwise allow us to pass in the information.

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')