← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.py

  • Committer: Jelmer Vernooij
  • Date: 2010-12-20 11:57:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5577.
  • Revision ID: jelmer@samba.org-20101220115714-2ru3hfappjweeg7q
Don't use no-plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branchbuilder.py
324
324
        # should look like it was not modified in the merge
325
325
        self.assertEqual('C-id', d_tree.inventory['c-id'].revision)
326
326
 
 
327
    def test_set_parent_to_null(self):
 
328
        builder = self.build_a_rev()
 
329
        builder.start_series()
 
330
        self.addCleanup(builder.finish_series)
 
331
        builder.build_snapshot('B-id', [],
 
332
            [('add', ('', None, 'directory', None))])
 
333
        # We should now have a graph:
 
334
        #   A B
 
335
        # And not A => B
 
336
        repo = builder.get_branch().repository
 
337
        self.assertEqual({'A-id': (_mod_revision.NULL_REVISION,),
 
338
                          'B-id': (_mod_revision.NULL_REVISION,),},
 
339
                         repo.get_parent_map(['A-id', 'B-id']))
 
340
 
 
341
    
327
342
    def test_start_finish_series(self):
328
343
        builder = BranchBuilder(self.get_transport().clone('foo'))
329
344
        builder.start_series()