/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/tests/test_merge3.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-12 01:41:38 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181112014138-3b0zyx91cu3wdq3k
More PEP8 fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_merge3.py
318
318
        m_lines = m3.merge_lines(b'OTHER', b'THIS', reprocess=True)
319
319
        merged_text = b"".join(list(m_lines))
320
320
        optimal_text = (b"a\n" * 10 + b"<<<<<<< OTHER\nc\n"
321
 
            + 8 * b"b\n" + b"c\n=======\n"
322
 
                        +  10*b"b\n" + b">>>>>>> THIS\n")
 
321
                        + 8 * b"b\n" + b"c\n=======\n"
 
322
                        + 10 * b"b\n" + b">>>>>>> THIS\n")
323
323
        self.assertEqualDiff(optimal_text, merged_text)
324
324
 
325
325
    def test_minimal_conflicts_unique(self):
334
334
        m_lines = m3.merge_lines(b'OTHER', b'THIS', reprocess=True)
335
335
        merged_text = b"".join(list(m_lines))
336
336
        optimal_text = b''.join(add_newline(b"abcdefghijklm")
337
 
            + [b"<<<<<<< OTHER\n1\n=======\nN\n>>>>>>> THIS\n"]
338
 
            + add_newline(b'OPQRSTUVWXY')
339
 
            + [b"<<<<<<< OTHER\n2\n=======\nZ\n>>>>>>> THIS\n"]
340
 
            )
 
337
                                + [b"<<<<<<< OTHER\n1\n=======\nN\n>>>>>>> THIS\n"]
 
338
                                + add_newline(b'OPQRSTUVWXY')
 
339
                                + [b"<<<<<<< OTHER\n2\n=======\nZ\n>>>>>>> THIS\n"]
 
340
                                )
341
341
        self.assertEqualDiff(optimal_text, merged_text)
342
342
 
343
343
    def test_minimal_conflicts_nonunique(self):
352
352
        m_lines = m3.merge_lines(b'OTHER', b'THIS', reprocess=True)
353
353
        merged_text = b"".join(list(m_lines))
354
354
        optimal_text = b''.join(add_newline(b"abacddefgghijk")
355
 
            + [b"<<<<<<< OTHER\nn\n=======\na\n>>>>>>> THIS\n"]
356
 
            + add_newline(b'lmontfpr')
357
 
            + [b"<<<<<<< OTHER\nd\n=======\nz\n>>>>>>> THIS\n"]
358
 
            )
 
355
                                + [b"<<<<<<< OTHER\nn\n=======\na\n>>>>>>> THIS\n"]
 
356
                                + add_newline(b'lmontfpr')
 
357
                                + [b"<<<<<<< OTHER\nd\n=======\nz\n>>>>>>> THIS\n"]
 
358
                                )
359
359
        self.assertEqualDiff(optimal_text, merged_text)
360
360
 
361
361
    def test_reprocess_and_base(self):