← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
194
194
        self.build_tree(['foo'], transport=tree.bzrdir.root_transport)
195
195
        tree.add('foo')
196
196
        tree.commit('revision 1', rev_id='1')
197
 
        tree.bzrdir.open_branch().set_revision_history([])
 
197
        tree.bzrdir.open_branch().generate_revision_history(
 
198
            bzrlib.revision.NULL_REVISION)
198
199
        tree.set_parent_trees([])
199
200
        tree.commit('revision 2', rev_id='2')
200
201
        # Copy the content (i.e. revisions) from the 'commit_tree' branch's
222
223
        self.build_tree(['commit_tree/foo'])
223
224
        tree.add('foo')
224
225
        tree.commit('revision 1', rev_id='1')
225
 
        tree.branch.bzrdir.open_branch().set_revision_history([])
 
226
        tree.branch.bzrdir.open_branch().generate_revision_history(
 
227
            bzrlib.revision.NULL_REVISION)
226
228
        tree.set_parent_trees([])
227
229
        tree.commit('revision 2', rev_id='2')
228
230
        tree.branch.repository.copy_content_into(shared_repo)
249
251
        self.build_tree(['commit_tree/foo'])
250
252
        tree.add('foo')
251
253
        tree.commit('revision 1', rev_id='1')
252
 
        tree.branch.bzrdir.open_branch().set_revision_history([])
 
254
        tree.branch.bzrdir.open_branch().generate_revision_history(
 
255
            bzrlib.revision.NULL_REVISION)
253
256
        tree.set_parent_trees([])
254
257
        tree.commit('revision 2', rev_id='2')
255
258
        source = self.make_repository('source')
447
450
        self.build_tree(['commit_tree/foo'])
448
451
        tree.add('foo')
449
452
        tree.commit('revision 1', rev_id='1')
450
 
        tree.bzrdir.open_branch().set_revision_history([])
 
453
        tree.bzrdir.open_branch().generate_revision_history(
 
454
            bzrlib.revision.NULL_REVISION)
451
455
        tree.set_parent_trees([])
452
456
        tree.commit('revision 2', rev_id='2')
453
457
        source = self.make_repository('source')
470
474
        self.build_tree(['commit_tree/foo'])
471
475
        tree.add('foo')
472
476
        tree.commit('revision 1', rev_id='1')
473
 
        tree.bzrdir.open_branch().set_revision_history([])
 
477
        tree.bzrdir.open_branch().generate_revision_history(
 
478
            bzrlib.revision.NULL_REVISION)
474
479
        tree.set_parent_trees([])
475
480
        tree.commit('revision 2', rev_id='2')
476
481
        tree.branch.repository.copy_content_into(shared_repo)
490
495
        self.build_tree(['commit_tree/foo'])
491
496
        tree.add('foo')
492
497
        tree.commit('revision 1', rev_id='1')
493
 
        tree.bzrdir.open_branch().set_revision_history([])
 
498
        tree.bzrdir.open_branch().generate_revision_history(
 
499
            bzrlib.revision.NULL_REVISION)
494
500
        tree.set_parent_trees([])
495
501
        tree.commit('revision 2', rev_id='2')
496
502
        tree.branch.repository.copy_content_into(shared_repo)
517
523
        self.build_tree(['commit_tree/foo'])
518
524
        tree.add('foo')
519
525
        tree.commit('revision 1', rev_id='1')
520
 
        tree.bzrdir.open_branch().set_revision_history([])
 
526
        tree.bzrdir.open_branch().generate_revision_history(
 
527
            bzrlib.revision.NULL_REVISION)
521
528
        tree.set_parent_trees([])
522
529
        tree.commit('revision 2', rev_id='2')
523
530
        source = self.make_repository('source')
540
547
        self.build_tree(['commit_tree/foo'])
541
548
        tree.add('foo')
542
549
        tree.commit('revision 1', rev_id='1')
543
 
        tree.bzrdir.open_branch().set_revision_history([])
 
550
        br = tree.bzrdir.open_branch()
 
551
        br.set_last_revision_info(0, bzrlib.revision.NULL_REVISION)
544
552
        tree.set_parent_trees([])
545
553
        tree.commit('revision 2', rev_id='2')
546
554
        source = self.make_repository('source')