← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Lalo Martins
  • Date: 2005-09-07 08:20:27 UTC
  • mto: (1185.1.5)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050907082026-401ea0f66d26dcca
moving DivergedBranches from bzrlib.branch to bzrlib.errors, obeying:
# XXX: move into bzrlib.errors; subclass BzrError

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
24
24
     splitpath, \
25
25
     sha_file, appendpath, file_kind
26
26
 
27
 
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId
 
27
from bzrlib.errors import BzrError, InvalidRevisionNumber, InvalidRevisionId, \
 
28
     DivergedBranches
28
29
import bzrlib.errors
29
30
from bzrlib.textui import show_status
30
31
from bzrlib.revision import Revision
133
134
 
134
135
 
135
136
 
136
 
# XXX: move into bzrlib.errors; subclass BzrError    
137
 
class DivergedBranches(Exception):
138
 
    def __init__(self, branch1, branch2):
139
 
        self.branch1 = branch1
140
 
        self.branch2 = branch2
141
 
        Exception.__init__(self, "These branches have diverged.")
142
 
 
143
137
 
144
138
######################################################################
145
139
# branch objects