← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testmerge3.py

  • Committer: Martin Pool
  • Date: 2005-09-06 02:26:28 UTC
  • Revision ID: mbp@sourcefrog.net-20050906022628-66d65f0feb4a9e80
- implement version 5 xml storage, and tests

  This stores files identified by the version that introduced the 
  text, and the version that introduced the name.  Entry kinds are
  given by the xml tag not an explicit kind field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testmerge3.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
 
from bzrlib.selftest import InTempDir, TestCase
 
18
from bzrlib.selftest import TestCaseInTempDir, TestCase
19
19
from bzrlib.merge3 import Merge3
20
20
 
21
21
def split_lines(t):
82
82
     The two are the same,
83
83
     But after they are produced,
84
84
       they have different names.
85
 
<<<<<<<< LAO
86
 
========
 
85
<<<<<<< LAO
 
86
=======
87
87
     
88
88
       -- The Way of Lao-Tzu, tr. Wing-tsit Chan
89
89
 
90
 
>>>>>>>> TAO
 
90
>>>>>>> TAO
91
91
""")
92
92
 
93
93
class TestMerge3(TestCase):
221
221
                            start_marker='<<',
222
222
                            mid_marker='--',
223
223
                            end_marker='>>')
224
 
        self.assertEquals(''.join(m3.merge_lines()),
225
 
                          'aaa\n222\nbbb\n')
 
224
        self.assertEquals(''.join(ml), 'aaa\n222\nbbb\n')
 
225
        
226
226
 
227
227
    def test_insert_clash(self):
228
228
        """Both try to insert lines in the same place."""
300
300
        self.log('merge result:')
301
301
        self.log(''.join(ml))
302
302
        self.assertEquals(ml, MERGED_RESULT)
303
 
 
304
 
 
305
 
TEST_CLASSES = [ TestMerge3 ]