← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-07 10:45:44 UTC
  • mfrom: (2321.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070307104544-59e3e6358e4bdb29
(robertc) Merge dirstate and subtrees. (Robert Collins, Martin Pool, Aaaron Bentley, John A Meinel, James Westby)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
103
103
        self.run_bzr('unbind', retcode=3)
104
104
 
105
105
    def test_bind_branch6(self):
106
 
        branch1 = self.make_branch('branch1', format='experimental-branch6')
 
106
        branch1 = self.make_branch('branch1', format='dirstate-with-subtree')
107
107
        os.chdir('branch1')
108
108
        error = self.run_bzr('bind', retcode=3)[1]
109
109
        self.assertContainsRe(error, 'no previous location known')
115
115
        branch2.unbind()
116
116
 
117
117
    def test_rebind_branch6(self):
118
 
        self.setup_rebind('experimental-branch6')
 
118
        self.setup_rebind('dirstate-with-subtree')
119
119
        os.chdir('branch2')
120
120
        self.run_bzr('bind')
121
121
        b = Branch.open('.')