/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/launchpad/lp_api.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 08:48:25 UTC
  • mfrom: (7141.6.1 python3-encode)
  • Revision ID: breezy.the.bot@gmail.com-20181116084825-ygjnkoy1kfh92r34
Encode revision ids before passing into graph functions.

Merged from https://code.launchpad.net/~jelmer/brz/python3-encode/+merge/356755

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/launchpad/lp_api.py
282
282
                               self.lp.bzr_identity)
283
283
                    return
284
284
                graph = self.bzr.repository.get_graph()
285
 
                if not graph.is_ancestor(self.lp.last_scanned_id,
 
285
                if not graph.is_ancestor(osutils.safe_utf8(self.lp.last_scanned_id),
286
286
                                         self.bzr.last_revision()):
287
287
                    raise errors.DivergedBranches(self.bzr, self.push_bzr)
288
288
                trace.note(gettext('Pushing to %s') % self.lp.bzr_identity)