← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.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_status.py
28
28
 
29
29
from bzrlib.tests import TestCaseInTempDir
30
30
from bzrlib.revisionspec import RevisionSpec
31
 
from bzrlib.merge import merge
 
31
from bzrlib.builtins import merge
32
32
from bzrlib.status import show_status
33
33
from bzrlib.branch import Branch
34
 
from bzrlib.clone import copy_branch
35
34
 
36
35
class BranchStatus(TestCaseInTempDir):
37
36
    
111
110
        mkdir("./branch")
112
111
        b = Branch.initialize('./branch')
113
112
        b.working_tree().commit("Empty commit 1")
114
 
        b_2 = copy_branch(b, './copy')
 
113
        b_2 = b.clone('./copy')
115
114
        b.working_tree().commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
116
115
        merge(["./branch", -1], [None, None], this_dir = './copy')
117
116
        message = self.status_string(b_2)