← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-08-25 03:23:17 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825032317-fe3c65b2a432adc8
merge from mpool up to 1109

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
3
3
from bzrlib.changeset import Inventory, Diff3Merge
4
4
from bzrlib import find_branch
5
5
import bzrlib.osutils
6
 
from bzrlib.errors import BzrCommandError
 
6
from bzrlib.errors import BzrCommandError, UnrelatedBranches
7
7
from bzrlib.delta import compare_trees
8
8
from trace import mutter, warning
9
9
import os.path
18
18
# stage 1: generate OLD->OTHER,
19
19
# stage 2: use MINE and OLD->OTHER to generate MINE -> RESULT
20
20
 
21
 
class UnrelatedBranches(BzrCommandError):
22
 
    def __init__(self):
23
 
        msg = "Branches have no common ancestor, and no base revision"\
24
 
            " specified."
25
 
        BzrCommandError.__init__(self, msg)
26
 
 
27
 
 
28
21
class MergeConflictHandler(ExceptionConflictHandler):
29
22
    """Handle conflicts encountered while merging.
30
23