← 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: Canonical.com Patch Queue Manager
  • Date: 2010-11-11 08:45:19 UTC
  • mfrom: (4597.9.22 reports-conflict-resolved)
  • Revision ID: pqm@pqm.ubuntu.com-20101111084519-bmk1zmblp7kex41a
(vila) More feedback about the conflicts just resolved and the remaining
 ones. (Vincent Ladeuil)

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
 
    
342
327
    def test_start_finish_series(self):
343
328
        builder = BranchBuilder(self.get_transport().clone('foo'))
344
329
        builder.start_series()