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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/propose.py
97
97
        self.hoster = hoster
98
98
 
99
99
 
 
100
class SourceNotDerivedFromTarget(errors.BzrError):
 
101
    """Source branch is not derived from target branch."""
 
102
 
 
103
    _fmt = ("Source %(source_branch)r not derived from "
 
104
            "target %(target_branch)r.")
 
105
 
 
106
    def __init__(self, source_branch, target_branch):
 
107
        errors.BzrError.__init__(
 
108
            self, source_branch=source_branch,
 
109
            target_branch=target_branch)
 
110
 
 
111
 
100
112
class MergeProposal(object):
101
113
    """A merge proposal.
102
114