/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/per_branch/test_reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-13 00:42:16 UTC
  • mfrom: (7027.3.8 python3-n)
  • mto: This revision was merged to the branch mainline in revision 7039.
  • Revision ID: jelmer@jelmer.uk-20180713004216-p2cv2oxlrb7wg4l0
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_reconcile.py
81
81
        tree = self.make_branch_and_tree('test')
82
82
        if not tree.branch.repository._format.supports_ghosts:
83
83
            raise TestNotApplicable("repository format does not support ghosts")
84
 
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
84
        tree.set_parent_ids([b"spooky"], allow_leftmost_as_ghost=True)
85
85
        r1 = tree.commit('one')
86
86
        r2 = tree.commit('two')
87
87
        tree.branch.set_last_revision_info(2, r2)