← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

Merge from aaron. Whee, we are synced. Yay. Begone the foul demons of merge conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
28
28
from bzrlib.status import show_status
29
29
from bzrlib.branch import Branch
30
30
from os import mkdir
31
 
from bzrlib.clone import copy_branch
32
31
 
33
32
class BranchStatus(TestCaseInTempDir):
34
33
    
107
106
        mkdir("./branch")
108
107
        b = Branch.initialize('./branch')
109
108
        b.working_tree().commit("Empty commit 1")
110
 
        b_2 = copy_branch(b, './copy')
 
109
        b_2 = b.clone('./copy')
111
110
        b.working_tree().commit("Empty commit 2")
112
111
        merge(["./branch", -1], [None, None], this_dir = './copy')
113
112
        message = self.status_string(b_2)