← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge3.py

  • Committer: Robert Collins
  • Date: 2006-03-28 14:29:13 UTC
  • mto: (1626.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1628.
  • Revision ID: robertc@robertcollins.net-20060328142913-ac5afb37075719c6
Convert log to use the new tsort.merge_sort routine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge3.py
17
17
 
18
18
from bzrlib.tests import TestCaseInTempDir, TestCase
19
19
from bzrlib.merge3 import Merge3
20
 
from bzrlib.errors import CantReprocessAndShowBase, BinaryFile
 
20
from bzrlib.errors import CantReprocessAndShowBase
21
21
 
22
22
def split_lines(t):
23
23
    from cStringIO import StringIO
324
324
        m_lines = m3.merge_lines('OTHER', 'THIS', reprocess=True, 
325
325
                                 base_marker='|||||||')
326
326
        self.assertRaises(CantReprocessAndShowBase, list, m_lines)
327
 
 
328
 
    def test_binary(self):
329
 
        self.assertRaises(BinaryFile, Merge3, ['\x00'], ['a'], ['b'])