/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/propose/cmds.py

  • Committer: Jelmer Vernooij
  • Date: 2019-07-07 17:04:58 UTC
  • mfrom: (7363 work)
  • mto: This revision was merged to the branch mainline in revision 7365.
  • Revision ID: jelmer@jelmer.uk-20190707170458-lxn6l80o2sqpv6cq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/cmds.py
199
199
                prerequisite_branch=prerequisite_branch, labels=labels,
200
200
                commit_message=commit_message)
201
201
        except _mod_propose.MergeProposalExists as e:
202
 
            raise errors.BzrCommandError(gettext(
203
 
                'There is already a branch merge proposal: %s') % e.url)
204
 
        note(gettext('Merge proposal created: %s') % proposal.url)
 
202
            note(gettext('There is already a branch merge proposal: %s'), e.url)
 
203
        else:
 
204
            note(gettext('Merge proposal created: %s') % proposal.url)
205
205
 
206
206
 
207
207
class cmd_find_merge_proposal(Command):