← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_status.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
31
31
 
32
32
from bzrlib.clone import copy_branch
33
33
from bzrlib.branch import Branch
34
 
from bzrlib.merge import merge
 
34
from bzrlib.builtins import merge
35
35
from bzrlib.revisionspec import RevisionSpec
36
36
from bzrlib.status import show_status
37
37
from bzrlib.tests import TestCaseInTempDir
112
112
    def test_pending(self):
113
113
        """Pending merges display works, including Unicode"""
114
114
        mkdir("./branch")
115
 
        wt = WorkingTree.create_standalone('.')
 
115
        wt = WorkingTree.create_standalone('branch')
116
116
        b = wt.branch
117
117
        wt.commit("Empty commit 1")
118
 
        b_2 = copy_branch(b, './copy')
 
118
        b_2 = b.clone('./copy')
119
119
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
120
120
        merge(["./branch", -1], [None, None], this_dir = './copy')
121
121
        message = self.status_string(b_2)