← 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 Aarons integration branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
7
7
from bzrlib.errors import UnrelatedBranches, NoCommits, BzrCommandError
8
8
from bzrlib.revision import common_ancestor
9
9
from bzrlib.fetch import fetch
 
10
from bzrlib.osutils import pathjoin
10
11
 
11
12
 
12
13
class TestMerge(TestCaseInTempDir):
70
71
        tree = b.working_tree()
71
72
        os.mkdir('dirname1')
72
73
        tree.add('dirname1')
73
 
        filename = os.path.join('dirname1', 'name1')
 
74
        filename = pathjoin('dirname1', 'name1')
74
75
        file(filename, 'wb').write('Hello')
75
76
        tree.add(filename)
76
77
        tree.commit(message="hello")
77
 
        filename2 = os.path.join('dirname1', 'name2')
 
78
        filename2 = pathjoin('dirname1', 'name2')
78
79
        tree.rename_one(filename, filename2)
79
80
        tree.rename_one('dirname1', 'dirname2')
80
81
        transform_tree(tree, b.basis_tree())