/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 bzrlib/errors.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
3075
3075
    def __init__(self, source_branch, target_branch):
3076
3076
        self.source_branch = source_branch
3077
3077
        self.target_branch = target_branch
 
3078
 
 
3079
 
 
3080
class NoRoundtrippingSupport(BzrError):
 
3081
 
 
3082
    _fmt = ("Roundtripping is not supported between %(source_branch)r and "
 
3083
            "%(target_branch)r.")
 
3084
 
 
3085
    internal_error = True
 
3086
 
 
3087
    def __init__(self, source_branch, target_branch):
 
3088
        self.source_branch = source_branch
 
3089
        self.target_branch = target_branch