← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2008-06-06 16:40:46 UTC
  • mfrom: (3482 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3483.
  • Revision ID: aaron@aaronbentley.com-20080606164046-ghbxplxuhtpcb9iz
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
374
374
 
375
375
    def test_disk_name(self):
376
376
        tree_a, tree_b, branch_c = self.make_trees()
377
 
        tree_a.branch.nick = 'fancy-name'
 
377
        tree_a.branch.nick = 'fancy <name>'
378
378
        md = self.from_objects(tree_a.branch.repository, 'rev2a', 500, 120,
379
379
            tree_b.branch.base)
380
380
        self.assertEqual('fancy-name-2', md.get_disk_name(tree_a.branch))