/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: Jelmer Vernooij
  • Date: 2018-11-16 10:50:21 UTC
  • mfrom: (7164 work)
  • mto: This revision was merged to the branch mainline in revision 7165.
  • Revision ID: jelmer@jelmer.uk-20181116105021-xl419v2rh4aus1au
Merge trunk.

Show diffs side-by-side

added added

removed removed

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