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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-29 20:24:31 UTC
  • mfrom: (6999 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180629202431-2td8kihrsthzuvau
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_branch.py
100
100
        r = GitRepo.init('.')
101
101
        self.build_tree(['a'])
102
102
        r.stage(["a"])
103
 
        return r.do_commit("a", committer="Somebody <foo@example.com>")
 
103
        return r.do_commit("a", committer=b"Somebody <foo@example.com>")
104
104
 
105
105
    def test_last_revision_is_valid(self):
106
106
        head = self.simple_commit_a()
113
113
        self.build_tree(['b'])
114
114
        r = GitRepo(".")
115
115
        r.stage("b")
116
 
        revb = r.do_commit("b", committer="Somebody <foo@example.com>")
 
116
        revb = r.do_commit("b", committer=b"Somebody <foo@example.com>")
117
117
 
118
118
        thebranch = Branch.open('.')
119
119
        self.assertEqual((2, default_mapping.revision_id_foreign_to_bzr(revb)), thebranch.last_revision_info())