← 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 12:46:42 UTC
  • mfrom: (1116)
  • 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-20050825124642-45ed1cd74db10370
merge from mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
 
18
import os.path
 
19
import tempfile
 
20
import shutil
 
21
import errno
 
22
from fetch import greedy_fetch
 
23
 
 
24
import bzrlib.osutils
 
25
import bzrlib.revision
18
26
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
19
27
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
20
28
from bzrlib.changeset import Inventory, Diff3Merge
21
29
from bzrlib.branch import find_branch
22
 
from bzrlib.revision import is_ancestor
23
 
import bzrlib.osutils
24
30
from bzrlib.errors import BzrCommandError, UnrelatedBranches
25
31
from bzrlib.delta import compare_trees
26
 
from trace import mutter, warning
27
 
import os.path
28
 
import tempfile
29
 
import shutil
30
 
import errno
31
 
from fetch import greedy_fetch
32
 
 
 
32
from bzrlib.trace import mutter, warning
 
33
from bzrlib.fetch import greedy_fetch
 
34
from bzrlib.revision import is_ancestor
33
35
 
34
36
# comments from abentley on irc: merge happens in two stages, each
35
37
# of which generates a changeset object
282
284
                base_rev_id = base_branch.lookup_revision(base_revision[1])
283
285
            if base_rev_id is not None:
284
286
                base_is_ancestor = is_ancestor(this_rev_id, base_rev_id, 
285
 
                                               MultipleRevisionSources(
286
 
                                               this_branch, 
287
 
                                               base_branch))
 
287
                                               MultipleRevisionSources(this_branch, 
 
288
                                                                       base_branch))
288
289
            else:
289
290
                base_is_ancestor = False
290
291
        if file_list is None: