← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

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