/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/tests/test_merge_core.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-02-21 11:51:54 UTC
  • mfrom: (1559.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060221115154-a1b580a4225d536b
Merge in InterRepository API support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
3
3
import stat
4
4
import sys
5
5
 
 
6
import bzrlib
6
7
from bzrlib.add import smart_add_tree
7
8
from bzrlib.branch import ScratchBranch, Branch
8
9
from bzrlib.builtins import merge
9
10
from bzrlib.errors import (NotBranchError, NotVersionedError,
10
11
                           WorkingTreeNotRevision, BzrCommandError, NoDiff3)
11
 
from bzrlib.fetch import Fetcher
12
12
from bzrlib.inventory import RootEntry
13
13
import bzrlib.inventory as inventory
14
14
from bzrlib.merge import Merge3Merger, Diff3Merger, WeaveMerger
24
24
        def wt(name):
25
25
           path = pathjoin(self.dir, name)
26
26
           os.mkdir(path)
27
 
           b = Branch.initialize(path)
28
 
           wt = b.working_tree()
 
27
           wt = bzrlib.bzrdir.BzrDir.create_standalone_workingtree(path)
29
28
           tt = TreeTransform(wt)
30
29
           return wt, tt
31
30
        self.base, self.base_tt = wt('base') 
53
52
            tt.apply()
54
53
            wt.commit('branch commit')
55
54
            assert len(wt.branch.revision_history()) == 2
56
 
        Fetcher(self.this.branch, self.other.branch, 
57
 
                self.other.branch.last_revision())
 
55
        self.this.branch.fetch(self.other.branch)
58
56
        other_basis = self.other.branch.basis_tree()
59
57
        merger = merge_type(self.this, self.this, self.base, other_basis)
60
58
        return merger.cooked_conflicts