/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_branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-07 13:56:43 UTC
  • mfrom: (4241.6.9 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090407135643-r15qstzbwg87d2nq
(robertc) Add --development6-rich-root,
        disabling the legacy and unneeded development2 format,
        and activating the tests for CHK features disabled pending this format.
        (Robert Collins, John Arbash Meinel, Ian Clathworthy, Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
159
159
        """Branching a stacked branch is not stacked by default"""
160
160
        # We have a mainline
161
161
        trunk_tree = self.make_branch_and_tree('target',
162
 
            format='development')
 
162
            format='1.9')
163
163
        trunk_tree.commit('mainline')
164
164
        # and a branch from it which is stacked
165
165
        branch_tree = self.make_branch_and_tree('branch',
166
 
            format='development')
 
166
            format='1.9')
167
167
        branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
168
168
        # with some work on it
169
169
        branch_tree.commit('moar work plz')
183
183
        """Asking to stack on a stacked branch does work"""
184
184
        # We have a mainline
185
185
        trunk_tree = self.make_branch_and_tree('target',
186
 
            format='development')
 
186
            format='1.9')
187
187
        trunk_revid = trunk_tree.commit('mainline')
188
188
        # and a branch from it which is stacked
189
189
        branch_tree = self.make_branch_and_tree('branch',
190
 
            format='development')
 
190
            format='1.9')
191
191
        branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
192
192
        # with some work on it
193
193
        branch_revid = branch_tree.commit('moar work plz')
208
208
    def test_branch_stacked(self):
209
209
        # We have a mainline
210
210
        trunk_tree = self.make_branch_and_tree('mainline',
211
 
            format='development')
 
211
            format='1.9')
212
212
        original_revid = trunk_tree.commit('mainline')
213
213
        self.assertRevisionInRepository('mainline', original_revid)
214
214
        # and a branch from it which is stacked
226
226
        # We can branch stacking on a smart server
227
227
        from bzrlib.smart.server import SmartTCPServer_for_testing
228
228
        self.transport_server = SmartTCPServer_for_testing
229
 
        trunk = self.make_branch('mainline', format='development')
 
229
        trunk = self.make_branch('mainline', format='1.9')
230
230
        out, err = self.run_bzr(
231
231
            ['branch', '--stacked', self.get_url('mainline'), 'shallow'])
232
232