← 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: 2007-03-13 16:59:44 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2359.
  • Revision ID: abentley@panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
Decoded revision ids are utf-8

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
131
131
            patch='booga', patch_type='diff')
132
132
        md2 = merge_directive.MergeDirective.from_lines(md.to_lines())
133
133
        self.assertEqual('example:', md2.revision_id)
 
134
        self.assertIsInstance(md2.revision_id, str)
134
135
        self.assertEqual('sha', md2.testament_sha1)
135
136
        self.assertEqual('http://example.com', md2.target_branch)
136
137
        self.assertEqual('http://example.org', md2.source_branch)