~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_propose.py

  • Committer: Jelmer Vernooij
  • Date: 2011-06-16 11:58:04 UTC
  • mto: This revision was merged to the branch mainline in revision 5987.
  • Revision ID: jelmer@samba.org-20110616115804-7tnqon61emrbdoxm
RemoveĀ unusedĀ Tree._get_ancestors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
142
142
            if mp.queue_status in ('Merged', 'Rejected'):
143
143
                continue
144
144
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
145
 
                raise errors.BzrCommandError(gettext(
146
 
                    'There is already a branch merge proposal: %s') %
 
145
                raise errors.BzrCommandError(
 
146
                    'There is already a branch merge proposal: %s' %
147
147
                    lp_api.canonical_url(mp))
148
148
 
149
149
    def _get_prerequisite_branch(self):