471
471
# Unshelve the default, this is the reshelved 00, hence modifies file 1
472
472
self.run_bzr('unshelve', '--all', retcode=0)
473
473
self.assertEqual(file('test_file1').read(), self.MODIFIED)
475
def test_shelf_switch_basic(self):
476
self.tree = self.make_branch_and_tree('.')
477
self.__create_and_add_test_file()
479
# This should go to "default"
480
file('test_file', 'w').write(self.MODIFIED)
481
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
484
self.run_bzr('shelf', 'switch', 'other', retcode=0)
485
file('test_file', 'w').write(self.MODIFIED)
486
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
489
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
490
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
491
self.assertTrue(os.path.exists('.shelf/shelves/other/00'))
494
self.run_bzr('shelf', 'switch', 'default', retcode=0)
495
file('test_file', 'w').write(self.MODIFIED)
496
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
499
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
500
self.assertFalse(os.path.exists('.shelf/shelves/other/01'))