/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: John Arbash Meinel
  • Date: 2008-09-05 03:11:40 UTC
  • mfrom: (3691 +trunk)
  • mto: (3697.7.4 1.7)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: john@arbash-meinel.com-20080905031140-hj0adlcf30l7i99v
Merge in bzr.dev 3691

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
466
466
        source.commit('Add bar')
467
467
        subtree.merge_from_branch(source.branch)
468
468
 
 
469
    def test_merge_joined_branch(self):
 
470
        source = self.make_branch_and_tree('source', format='rich-root-pack')
 
471
        self.build_tree(['source/foo'])
 
472
        source.add('foo')
 
473
        source.commit('Add foo')
 
474
        target = self.make_branch_and_tree('target', format='rich-root-pack')
 
475
        self.build_tree(['target/bla'])
 
476
        target.add('bla')
 
477
        target.commit('Add bla')
 
478
        nested = source.bzrdir.sprout('target/subtree').open_workingtree()
 
479
        target.subsume(nested)
 
480
        target.commit('Join nested')
 
481
        self.build_tree(['source/bar'])
 
482
        source.add('bar')
 
483
        source.commit('Add bar')
 
484
        target.merge_from_branch(source.branch)
 
485
        target.commit('Merge source')
 
486
 
469
487
 
470
488
class TestPlanMerge(TestCaseWithMemoryTransport):
471
489