/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 breezy/bzr/tests/test_weave.py

  • Committer: Jelmer Vernooij
  • Date: 2020-06-19 21:26:53 UTC
  • mfrom: (7490.40.19 work)
  • mto: This revision was merged to the branch mainline in revision 7516.
  • Revision ID: jelmer@jelmer.uk-20200619212653-7j6rgywzczhc8cmj
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/tests/test_weave.py
530
530
                         [b"first line",
531
531
                          b"alternative second line"])
532
532
 
533
 
        self.assertEqual(list(k.get_ancestry([b'2'])),
534
 
                         [b'0', b'2'])
 
533
        self.assertEqual(set(k.get_ancestry([b'2'])),
 
534
                         set([b'0', b'2']))
535
535
 
536
536
 
537
537
class ReplaceLine(TestBase):
579
579
                          (b'text2', b'line from 2'),
580
580
                          ])
581
581
 
582
 
        self.assertEqual(list(k.get_ancestry([b'merge'])),
583
 
                         [b'text0', b'text1', b'text2', b'merge'])
 
582
        self.assertEqual(set(k.get_ancestry([b'merge'])),
 
583
                         set([b'text0', b'text1', b'text2', b'merge']))
584
584
 
585
585
        self.log('k._weave=' + pformat(k._weave))
586
586