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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-06-19 21:22:56 UTC
  • mfrom: (2490.2.29 graphwalker)
  • Revision ID: pqm@pqm.ubuntu.com-20070619212256-y1148bn5gf4jg2dh
[MERGE] handle null revision properly for LCA

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
202
202
        tree_a.commit('Commit of rev2a', rev_id='rev2a')
203
203
        return tree_a, tree_b, branch_c
204
204
 
 
205
    def test_empty_target(self):
 
206
        tree_a, tree_b, branch_c = self.make_trees()
 
207
        tree_d = self.make_branch_and_tree('tree_d')
 
208
        md2 = merge_directive.MergeDirective.from_objects(
 
209
            tree_a.branch.repository, 'rev2a', 500, 120, tree_d.branch.base,
 
210
            patch_type='diff', public_branch=tree_a.branch.base)
 
211
 
205
212
    def test_generate_patch(self):
206
213
        tree_a, tree_b, branch_c = self.make_trees()
207
214
        md2 = merge_directive.MergeDirective.from_objects(