/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: Andrew Bennetts
  • Date: 2008-03-12 20:13:07 UTC
  • mfrom: (3267 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080312201307-ngd5bynt2nvhnlb7
Merge from bzr.dev.

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,