/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testrevisionnamespaces.py

  • Committer: Aaron Bentley
  • Date: 2005-11-25 13:15:49 UTC
  • mto: (1185.65.14 storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051125131549-a788fd1cc848a6f0
Applied Jelmer's patch to make clone a branch operation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testrevisionnamespaces.py
21
21
from bzrlib.selftest import TestCaseInTempDir
22
22
from bzrlib.errors import NoCommonAncestor, NoCommits
23
23
from bzrlib.errors import NoSuchRevision
24
 
from bzrlib.clone import copy_branch
25
24
from bzrlib.merge import merge
26
25
from bzrlib.revisionspec import RevisionSpec
27
26
 
69
68
        self.assertRaises(NoCommits, RevisionSpec('ancestor:.').in_history, b2)
70
69
 
71
70
        os.mkdir('copy')
72
 
        b3 = copy_branch(b, 'copy')
 
71
        b3 = b.clone('copy')
73
72
        b3.working_tree().commit('Commit four', rev_id='b@r-0-4')
74
73
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
75
74
                          'a@r-0-3')
86
85
        branch = Branch.initialize('branch1')
87
86
        branch.working_tree().add(['file'])
88
87
        branch.working_tree().commit('add file')
89
 
        copy_branch(branch, 'branch2')
 
88
        branch.clone('branch2')
90
89
        print >> open('branch2/file', 'w'), 'new content'
91
90
        branch2 = Branch.open('branch2')
92
91
        branch2.working_tree().commit('update file', rev_id='A')