← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Martin Pool
  • Date: 2006-01-30 06:23:50 UTC
  • mfrom: (1534.1.17 integration)
  • Revision ID: mbp@sourcefrog.net-20060130062350-d6f25277ddcdfd79
[merge] robert's integration of much recent work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
3
3
from bzrlib.branch import Branch
4
4
from bzrlib.commit import commit
5
5
from bzrlib.tests import TestCaseInTempDir
6
 
from bzrlib.merge import merge, transform_tree
 
6
from bzrlib.builtins import merge
 
7
from bzrlib.merge import transform_tree
7
8
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
8
9
from bzrlib.revision import common_ancestor
9
10
from bzrlib.fetch import fetch
12
13
 
13
14
class TestMerge(TestCaseInTempDir):
14
15
    """Test appending more than one revision"""
 
16
 
15
17
    def test_pending(self):
16
18
        br = Branch.initialize(u".")
17
19
        commit(br, "lala!")
52
54
        br1, br2 = self.test_pending_with_null()
53
55
        commit(br1, "blah")
54
56
        last = br1.last_revision()
55
 
        self.assertEquals(common_ancestor(last, last, br1), last)
 
57
        self.assertEquals(common_ancestor(last, last, br1.repository), last)
56
58
 
57
59
    def test_create_rename(self):
58
60
        """Rename an inventory entry while creating the file"""