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

  • Committer: Aaron Bentley
  • Date: 2008-04-24 04:58:42 UTC
  • mfrom: (3377 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3380.
  • Revision ID: aaron@aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
450
450
        finally:
451
451
            tree_file.close()
452
452
 
 
453
    def test_merge_add_into_deleted_root(self):
 
454
        # Yes, people actually do this.  And report bugs if it breaks.
 
455
        source = self.make_branch_and_tree('source', format='rich-root-pack')
 
456
        self.build_tree(['source/foo/'])
 
457
        source.add('foo', 'foo-id')
 
458
        source.commit('Add foo')
 
459
        target = source.bzrdir.sprout('target').open_workingtree()
 
460
        subtree = target.extract('foo-id')
 
461
        subtree.commit('Delete root')
 
462
        self.build_tree(['source/bar'])
 
463
        source.add('bar', 'bar-id')
 
464
        source.commit('Add bar')
 
465
        subtree.merge_from_branch(source.branch)
 
466
 
453
467
 
454
468
class TestPlanMerge(TestCaseWithMemoryTransport):
455
469
 
456
470
    def setUp(self):
457
471
        TestCaseWithMemoryTransport.setUp(self)
458
 
        self.vf = knit.KnitVersionedFile('root', self.get_transport(),
459
 
                                         create=True)
 
472
        self.vf = knit.make_file_knit('root', self.get_transport(),
 
473
            create=True)
460
474
        self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root',
461
475
                                                                   [self.vf])
462
476