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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-08-12 19:51:40 UTC
  • mfrom: (7380.1.2 more-git-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20190812195140-guyldqnadc30atyj
Several more fixes for git merge proposals.

Merged from https://code.launchpad.net/~jelmer/brz/more-git-fixes/+merge/371172

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/propose.py
139
139
        """Merge this merge proposal."""
140
140
        raise NotImplementedError(self.merge)
141
141
 
 
142
    def can_be_merged(self):
 
143
        """Can this merge proposal be merged?
 
144
 
 
145
        The answer to this can be no if e.g. it has conflics.
 
146
        """
 
147
        raise NotImplementedError(self.can_be_merged)
 
148
 
142
149
 
143
150
class MergeProposalBuilder(object):
144
151
    """Merge proposal creator.