1
# Copyright (C) 2007-2010 Canonical Ltd
1
# Copyright (C) 2007 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
100
100
self.assertContainsRe(str(err),
101
101
"Pending merges must be committed or reverted before using switch")
103
def test_switch_with_revision(self):
104
"""Test switch when a revision is given."""
105
# Create a tree with 2 revisions
106
tree = self.make_branch_and_tree('branch-1')
107
self.build_tree(['branch-1/file-1'])
109
tree.commit(rev_id='rev1', message='rev1')
110
self.build_tree(['branch-1/file-2'])
112
tree.commit(rev_id='rev2', message='rev2')
113
# Check it out and switch to revision 1
114
checkout = tree.branch.create_checkout('checkout',
115
lightweight=self.lightweight)
116
switch.switch(checkout.bzrdir, tree.branch, revision_id="rev1")
117
self.failUnlessExists('checkout/file-1')
118
self.failIfExists('checkout/file-2')
120
def test_switch_changing_root_id(self):
121
tree = self._setup_tree()
122
tree2 = self.make_branch_and_tree('tree-2')
123
tree2.set_root_id('custom-root-id')
124
self.build_tree(['tree-2/file-2'])
125
tree2.add(['file-2'])
126
tree2.commit('rev1b')
127
checkout = tree.branch.create_checkout('checkout',
128
lightweight=self.lightweight)
129
switch.switch(checkout.bzrdir, tree2.branch)
130
self.assertEqual('custom-root-id', tree2.get_root_id())
133
104
class TestSwitchHeavyweight(TestSwitch):
added
removed
bzrlib/tests/test_switch.py
