← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

Merge from integration.

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
 
6
from bzrlib.merge import merge, transform_tree
7
7
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
8
8
from bzrlib.revision import common_ancestor
9
9
from bzrlib.fetch import fetch
12
12
class TestMerge(TestCaseInTempDir):
13
13
    """Test appending more than one revision"""
14
14
    def test_pending(self):
15
 
        br = Branch.initialize(".")
 
15
        br = Branch.initialize(u".")
16
16
        commit(br, "lala!")
17
17
        self.assertEquals(len(br.working_tree().pending_merges()), 0)
18
 
        merge(['.', -1], [None, None])
 
18
        merge([u'.', -1], [None, None])
19
19
        self.assertEquals(len(br.working_tree().pending_merges()), 0)
20
20
 
21
21
    def test_nocommits(self):
36
36
    def test_pending_with_null(self):
37
37
        """When base is forced to revno 0, pending_merges is set"""
38
38
        br2 = self.test_unrelated()
39
 
        br1 = Branch.open('.')
 
39
        br1 = Branch.open(u'.')
40
40
        fetch(from_branch=br2, to_branch=br1)
41
41
        # merge all of branch 2 into branch 1 even though they 
42
42
        # are not related.
52
52
        commit(br1, "blah")
53
53
        last = br1.last_revision()
54
54
        self.assertEquals(common_ancestor(last, last, br1.storage), last)
 
55
 
 
56
    def test_create_rename(self):
 
57
        """Rename an inventory entry while creating the file"""
 
58
        b = Branch.initialize(u'.')
 
59
        file('name1', 'wb').write('Hello')
 
60
        tree = b.working_tree()
 
61
        tree.add('name1')
 
62
        tree.commit(message="hello")
 
63
        tree.rename_one('name1', 'name2')
 
64
        os.unlink('name2')
 
65
        transform_tree(tree, b.basis_tree())
 
66
 
 
67
    def test_layered_rename(self):
 
68
        """Rename both child and parent at same time"""
 
69
        b = Branch.initialize(u'.')
 
70
        tree = b.working_tree()
 
71
        os.mkdir('dirname1')
 
72
        tree.add('dirname1')
 
73
        filename = os.path.join('dirname1', 'name1')
 
74
        file(filename, 'wb').write('Hello')
 
75
        tree.add(filename)
 
76
        tree.commit(message="hello")
 
77
        filename2 = os.path.join('dirname1', 'name2')
 
78
        tree.rename_one(filename, filename2)
 
79
        tree.rename_one('dirname1', 'dirname2')
 
80
        transform_tree(tree, b.basis_tree())