← 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: Alexander Belchenko
  • Date: 2007-02-02 09:14:30 UTC
  • mfrom: (2256 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2259.
  • Revision ID: bialix@ukr.net-20070202091430-vdgouvazded1yfqw
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
173
173
            conflicts.DeletingParent('Not deleting', 'b', 'b-id'),
174
174
            conflicts.UnversionedParent('Versioned directory', 'b', 'b-id')],
175
175
            tree_a.conflicts())
 
176
 
 
177
    def test_merge_with_missing(self):
 
178
        tree_a = self.make_branch_and_tree('tree_a')
 
179
        self.build_tree_contents([('tree_a/file', 'content_1')])
 
180
        tree_a.add('file')
 
181
        tree_a.commit('commit base')
 
182
        base_tree = tree_a.basis_tree()
 
183
        tree_b = tree_a.bzrdir.sprout('tree_b').open_workingtree()
 
184
        self.build_tree_contents([('tree_a/file', 'content_2')])
 
185
        tree_a.commit('commit other')
 
186
        other_tree = tree_a.basis_tree()
 
187
        os.unlink('tree_b/file')
 
188
        merge_inner(tree_b.branch, other_tree, base_tree, this_tree=tree_b)