← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_weave.py

  • Committer: Martin Pool
  • Date: 2006-03-06 11:20:10 UTC
  • mfrom: (1593 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1611.
  • Revision ID: mbp@sourcefrog.net-20060306112010-17c0170dde5d1eea
[merge] large merge to sync with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_weave.py
765
765
        self.doMerge(['aaa', 'bbb'],
766
766
                     ['aaa', 'xxx', 'yyy', 'bbb'],
767
767
                     ['aaa', 'xxx', 'bbb'],
768
 
                     ['aaa', '<<<<<<<', 'xxx', 'yyy', '=======', 'xxx', 
769
 
                      '>>>>>>>', 'bbb'])
 
768
                     ['aaa', '<<<<<<< ', 'xxx', 'yyy', '=======', 'xxx', 
 
769
                      '>>>>>>> ', 'bbb'])
770
770
 
771
771
        # really it ought to reduce this to 
772
772
        # ['aaa', 'xxx', 'yyy', 'bbb']
776
776
        self.doMerge(['aaa'],
777
777
                     ['xxx'],
778
778
                     ['yyy', 'zzz'],
779
 
                     ['<<<<<<<', 'xxx', '=======', 'yyy', 'zzz', 
780
 
                      '>>>>>>>'])
 
779
                     ['<<<<<<< ', 'xxx', '=======', 'yyy', 'zzz', 
 
780
                      '>>>>>>> '])
781
781
 
782
782
    def testNonClashInsert(self):
783
783
        self.doMerge(['aaa'],
784
784
                     ['xxx', 'aaa'],
785
785
                     ['yyy', 'zzz'],
786
 
                     ['<<<<<<<', 'xxx', 'aaa', '=======', 'yyy', 'zzz', 
787
 
                      '>>>>>>>'])
 
786
                     ['<<<<<<< ', 'xxx', 'aaa', '=======', 'yyy', 'zzz', 
 
787
                      '>>>>>>> '])
788
788
 
789
789
        self.doMerge(['aaa'],
790
790
                     ['aaa'],
806
806
        self.doMerge(['aaa', 'bbb', 'ccc'],
807
807
                     ['aaa', 'ddd', 'ccc'],
808
808
                     ['aaa', 'ccc'],
809
 
                     ['<<<<<<<<', 'aaa', '=======', '>>>>>>>', 'ccc'])
 
809
                     ['<<<<<<<< ', 'aaa', '=======', '>>>>>>> ', 'ccc'])
810
810
 
811
811
 
812
812
class JoinWeavesTests(TestBase):