← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-08-25 08:26:12 UTC
  • Revision ID: mbp@sourcefrog.net-20050825082612-8a1fa6340388eb7f
- fix is_ancestor import problem in merge

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
 
 
23
import bzrlib.osutils
 
24
import bzrlib.revision
18
25
from bzrlib.merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
19
26
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
20
27
from bzrlib.changeset import Inventory, Diff3Merge
21
28
from bzrlib.branch import find_branch
22
 
import bzrlib.osutils
23
29
from bzrlib.errors import BzrCommandError, UnrelatedBranches
24
30
from bzrlib.delta import compare_trees
25
 
from trace import mutter, warning
26
 
import os.path
27
 
import tempfile
28
 
import shutil
29
 
import errno
30
 
from fetch import greedy_fetch
 
31
from bzrlib.trace import mutter, warning
 
32
from bzrlib.fetch import greedy_fetch
31
33
 
32
34
 
33
35
# comments from abentley on irc: merge happens in two stages, each
279
281
                base_rev_id = base_branch.lookup_revision(base_revision[1])
280
282
            if base_rev_id is not None:
281
283
                base_is_ancestor = is_ancestor(this_rev_id, base_rev_id, 
282
 
                                               MultipleRevisionSources(
283
 
                                               this_branch, 
284
 
                                               base_branch))
 
284
                                               MultipleRevisionSources(this_branch, 
 
285
                                                                       base_branch))
285
286
            else:
286
287
                base_is_ancestor = False
287
288
        if file_list is None: