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

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
1
1
import os
2
2
 
3
3
from bzrlib.branch import Branch
 
4
from bzrlib.builtins import merge
4
5
from bzrlib.commit import commit
5
 
from bzrlib.tests import TestCaseWithTransport
6
 
from bzrlib.merge import merge, transform_tree
7
6
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
8
 
from bzrlib.revision import common_ancestor
9
7
from bzrlib.fetch import fetch
 
8
from bzrlib.merge import transform_tree
10
9
from bzrlib.osutils import pathjoin
 
10
from bzrlib.revision import common_ancestor
 
11
from bzrlib.tests import TestCaseWithTransport
11
12
from bzrlib.workingtree import WorkingTree
12
13
 
13
14
 
54
55
        wt1, br2 = self.test_pending_with_null()
55
56
        wt1.commit("blah")
56
57
        last = wt1.branch.last_revision()
57
 
        self.assertEquals(common_ancestor(last, last, wt1.branch), last)
 
58
        self.assertEquals(common_ancestor(last, last, wt1.branch.repository), last)
58
59
 
59
60
    def test_create_rename(self):
60
61
        """Rename an inventory entry while creating the file"""