/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/plugins/rewrite/tests/test_rebase.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/rewrite/tests/test_rebase.py
653
653
        newwt.unlock()
654
654
        with open("new/afile", 'r') as f:
655
655
            self.assertEquals("E\n" + "A\n" * 10 + "C\n", f.read())
656
 
        newwt.set_conflicts(ConflictList())
 
656
        newwt.set_conflicts([])
657
657
        oldrev = newwt.branch.repository.get_revision(b"E")
658
658
        replayer.commit_rebase(oldrev, b"E'")
659
659
        newrev = newwt.branch.repository.get_revision(b"E'")