/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/tests/test_switch.py

  • Committer: John Arbash Meinel
  • Date: 2007-11-30 22:40:29 UTC
  • mfrom: (3060.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 3063.
  • Revision ID: john@arbash-meinel.com-20071130224029-bpqrx0fjkify8w8p
Merge in bzr.dev and updated NEWS for post 1.0rc1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_switch.py
57
57
        tree.add('file-2')
58
58
        tree.remove('file-1')
59
59
        tree.commit('rev2')
 
60
        self.build_tree(['checkout/file-3'])
 
61
        checkout.add('file-3')
 
62
        checkout_dir = checkout.bzrdir
 
63
        # rename the branch on disk, the checkout object is now invalid.
60
64
        os.rename('branch-1', 'branch-2')
61
65
        to_branch = branch.Branch.open('branch-2')
62
 
        self.build_tree(['checkout/file-3'])
63
 
        checkout.add('file-3')
64
66
        switch.switch(checkout.bzrdir, to_branch)
65
67
        self.failIfExists('checkout/file-1')
66
68
        self.failUnlessExists('checkout/file-2')