/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: John Arbash Meinel
  • Date: 2008-06-05 16:27:16 UTC
  • mfrom: (3475 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3476.
  • Revision ID: john@arbash-meinel.com-20080605162716-a3hn238tnctbfd8j
merge bzr.dev, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
372
372
            tree_d.branch.base, patch_type='diff',
373
373
            public_branch=tree_a.branch.base)
374
374
 
 
375
    def test_disk_name(self):
 
376
        tree_a, tree_b, branch_c = self.make_trees()
 
377
        tree_a.branch.nick = 'fancy-name'
 
378
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
 
379
            tree_b.branch.base)
 
380
        self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))
 
381
 
 
382
    def test_disk_name_old_revno(self):
 
383
        tree_a, tree_b, branch_c = self.make_trees()
 
384
        tree_a.branch.nick = 'fancy-name'
 
385
        md = self.from_objects(tree_a.branch.repository, 'rev1', 500, 120,
 
386
            tree_b.branch.base)
 
387
        self.assertEqual('fancy-name-1', md.get_disk_name(tree_a.branch))
 
388
 
375
389
    def test_generate_patch(self):
376
390
        tree_a, tree_b, branch_c = self.make_trees()
377
391
        md2 = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
606
620
        public_branch=None, message=None, base_revision_id=None):
607
621
        include_patch = (patch_type in ('bundle', 'diff'))
608
622
        include_bundle = (patch_type == 'bundle')
609
 
        assert patch_type in ('bundle', 'diff', None)
 
623
        self.assertTrue(patch_type in ('bundle', 'diff', None))
610
624
        return merge_directive.MergeDirective2.from_objects(
611
625
            repository, revision_id, time, timezone, target_branch,
612
626
            include_patch, include_bundle, local_target_branch, public_branch,