/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: Marius Kruger
  • Date: 2007-03-31 20:49:06 UTC
  • mfrom: (2384 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2455.
  • Revision ID: amanic@gmail.com-20070331204906-iai2v10wk3l3lt12
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
111
111
        self.assertRaises(errors.NotAMergeDirective,
112
112
                          merge_directive.MergeDirective.from_lines, 'lala')
113
113
 
 
114
    def test_deserialize_empty(self):
 
115
        self.assertRaises(errors.NotAMergeDirective,
 
116
                          merge_directive.MergeDirective.from_lines, [])
 
117
 
114
118
    def test_deserialize_leading_junk(self):
115
119
        md = merge_directive.MergeDirective.from_lines(INPUT1)
116
120
        self.assertEqual('example:', md.revision_id)